actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix restoring params

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-18 06:14:58 +00:00
parent 7f4b58a2ce
commit 6b7b6f5cd7
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+8 -12
View File
@@ -185,6 +185,7 @@ Actor* ActorUtil::LoadFromNode( const CString& sDir, const XNode* pNode )
} }
// Load Params // Load Params
map<CString, LuaReference> setOldParams;
{ {
FOREACH_CONST_Child( pNode, pChild ) FOREACH_CONST_Child( pNode, pChild )
{ {
@@ -204,7 +205,8 @@ Actor* ActorUtil::LoadFromNode( const CString& sDir, const XNode* pNode )
Lua *L = LUA->Get(); Lua *L = LUA->Get();
LuaHelpers::RunScript( L, "return " + s, "", 1 ); LuaHelpers::RunScript( L, "return " + s, "", 1 );
SetParamFromStack( L, sName, NULL );
SetParamFromStack( L, sName, &setOldParams[sName] );
LUA->Release(L); LUA->Release(L);
} }
else else
@@ -272,19 +274,13 @@ all_done:
// Unload Params // Unload Params
{ {
FOREACH_CONST_Child( pNode, pChild ) Lua *L = LUA->Get();
FOREACHM( CString, LuaReference, setOldParams, old )
{ {
if( pChild->m_sName == "Param" ) old->second.PushSelf( L );
{ SetParamFromStack( L, old->first, NULL );
CString sName;
if( !pChild->GetAttrValue( "Name", sName ) )
{
RageException::Throw( ssprintf("Param node in '%s' is missing the attribute 'Name'", sDir.c_str()) );
}
LUA->UnsetGlobal( sName );
}
} }
LUA->Release(L);
} }
return pReturn; return pReturn;