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

fix up Context handling

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-09 01:15:49 +00:00
parent afa611c36d
commit ce07b22b56
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+5 -13
View File
@@ -210,6 +210,7 @@ Actor::Actor( const Actor &cpy ):
* former is more important. */ * former is more important. */
void Actor::LoadFromNode( const RString& sDir, const XNode* pNode ) void Actor::LoadFromNode( const RString& sDir, const XNode* pNode )
{ {
Lua *L = LUA->Get();
FOREACH_CONST_Child( pNode, pChild ) FOREACH_CONST_Child( pNode, pChild )
{ {
if( pChild->GetName() == "Input" ) if( pChild->GetName() == "Input" )
@@ -222,7 +223,6 @@ void Actor::LoadFromNode( const RString& sDir, const XNode* pNode )
bool bOptional = false; bool bOptional = false;
pChild->GetAttrValue( "Optional", bOptional ); pChild->GetAttrValue( "Optional", bOptional );
Lua *L = LUA->Get();
this->PushSelf( L ); this->PushSelf( L );
LuaHelpers::Push( L, sName ); LuaHelpers::Push( L, sName );
ActorUtil::GetParam( L, sName ); ActorUtil::GetParam( L, sName );
@@ -232,7 +232,6 @@ void Actor::LoadFromNode( const RString& sDir, const XNode* pNode )
lua_settable( L, -3 ); lua_settable( L, -3 );
lua_pop( L, 1 ); lua_pop( L, 1 );
LUA->Release( L );
} }
if( pChild->GetName() == "Context" ) if( pChild->GetName() == "Context" )
@@ -241,24 +240,17 @@ void Actor::LoadFromNode( const RString& sDir, const XNode* pNode )
if( !pChild->GetAttrValue( "Name", sName ) ) if( !pChild->GetAttrValue( "Name", sName ) )
Dialog::OK( ssprintf("Context node in '%s' is missing the attribute \"Name\"", sDir.c_str()), "MISSING_ATTRIBUTE" ); Dialog::OK( ssprintf("Context node in '%s' is missing the attribute \"Name\"", sDir.c_str()), "MISSING_ATTRIBUTE" );
LuaHelpers::RunAtExpressionS( sName );
RString s;
if( !pChild->GetAttrValue( "Value", s ) )
Dialog::OK( ssprintf("Context node in '%s' is missing the attribute \"Value\"", sDir.c_str()), "MISSING_ATTRIBUTE" );
Lua *L = LUA->Get();
this->PushContext(L); this->PushContext(L);
lua_pushstring( L, sName ); lua_pushstring( L, sName );
LuaHelpers::RunExpression( L, s );
if( !pChild->PushAttrValue( L, "Value" ) )
Dialog::OK( ssprintf("Context node in '%s' is missing the attribute \"Value\"", sDir.c_str()), "MISSING_ATTRIBUTE" );
lua_settable( L, -3 ); lua_settable( L, -3 );
lua_pop( L, 1 ); lua_pop( L, 1 );
LUA->Release(L);
} }
} }
Lua *L = LUA->Get();
FOREACH_CONST_Attr( pNode, pAttr ) FOREACH_CONST_Attr( pNode, pAttr )
{ {
// Load Name, if any. // Load Name, if any.