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

Use non-const XNode in ActorUtil::LoadFromNode

Browse Source 
No-op aside from constness.  Need this later.
This commit is contained in:
Devin J. Pohly
2014-02-20 10:59:48 -05:00
parent 5644917565
commit a8018575b8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ActorUtil.cpp
+9 -7
View File
@@ -101,30 +101,32 @@ bool ActorUtil::ResolvePath( RString &sPath, const RString &sName )
return true; return true;
} }
Actor* ActorUtil::LoadFromNode( const XNode* pNode, Actor *pParentActor ) Actor *ActorUtil::LoadFromNode( const XNode* _pNode, Actor *pParentActor )
{ {
ASSERT( pNode != NULL ); ASSERT( _pNode != NULL );
XNode node = *_pNode;
// Remove this in favor of using conditionals in Lua. -Chris // Remove this in favor of using conditionals in Lua. -Chris
// There are a number of themes out there that depend on this (including // There are a number of themes out there that depend on this (including
// sm-ssc default). Probably for the best to leave this in. -aj // sm-ssc default). Probably for the best to leave this in. -aj
{ {
bool bCond; bool bCond;
if( pNode->GetAttrValue("Condition", bCond) && !bCond ) if( node.GetAttrValue("Condition", bCond) && !bCond )
return NULL; return NULL;
} }
RString sClass; RString sClass;
bool bHasClass = pNode->GetAttrValue( "Class", sClass ); bool bHasClass = node.GetAttrValue( "Class", sClass );
if( !bHasClass ) if( !bHasClass )
bHasClass = pNode->GetAttrValue( "Type", sClass ); bHasClass = node.GetAttrValue( "Type", sClass );
map<RString,CreateActorFn>::iterator iter = g_pmapRegistrees->find( sClass ); map<RString,CreateActorFn>::iterator iter = g_pmapRegistrees->find( sClass );
if( iter == g_pmapRegistrees->end() ) if( iter == g_pmapRegistrees->end() )
{ {
// sClass is invalid // sClass is invalid
RString sError = ssprintf( "%s: invalid Class \"%s\"", RString sError = ssprintf( "%s: invalid Class \"%s\"",
ActorUtil::GetWhere(pNode).c_str(), sClass.c_str() ); ActorUtil::GetWhere(&node).c_str(), sClass.c_str() );
Dialog::OK( sError ); Dialog::OK( sError );
return new Actor; // Return a dummy object so that we don't crash in AutoActor later. return new Actor; // Return a dummy object so that we don't crash in AutoActor later.
} }
@@ -135,7 +137,7 @@ Actor* ActorUtil::LoadFromNode( const XNode* pNode, Actor *pParentActor )
if( pParentActor ) if( pParentActor )
pRet->SetParent( pParentActor ); pRet->SetParent( pParentActor );
pRet->LoadFromNode( pNode ); pRet->LoadFromNode( &node );
return pRet; return pRet;
} }