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

lua always specifies the class

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-27 07:20:08 +00:00
parent 08acd04a36
commit 3ff91647d4
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+11 -22
View File
@@ -149,30 +149,14 @@ Actor* ActorUtil::LoadFromNode( const XNode* pNode, Actor *pParentActor )
{ {
pReturn = ActorUtil::Create( sClass, pNode, pParentActor ); pReturn = ActorUtil::Create( sClass, pNode, pParentActor );
} }
else // sClass is empty or garbage (e.g. "1" or "0 // 0==Sprite") else // sClass is invalid
{ {
// automatically figure out the type RString sError = ssprintf( "%s: invalid Class \"%s\"",
RString sFile; ActorUtil::GetWhere(pNode).c_str(), sClass.c_str() );
ActorUtil::GetAttrPath( pNode, "File", sFile ); Dialog::OK( sError );
pReturn = new Actor; // Return a dummy object so that we don't crash in AutoActor later.
/* Be careful: if sFile is "", and we don't check it, then we can end up recursively
* loading the layer we're in. */
if( sFile == "" )
{
RString sError = ssprintf( "%s: missing the File attribute or has an invalid Class \"%s\"",
ActorUtil::GetWhere(pNode).c_str(), sClass.c_str() );
Dialog::OK( sError );
pReturn = new Actor; // Return a dummy object so that we don't crash in AutoActor later.
goto all_done;
}
pReturn = ActorUtil::MakeActor( sFile, pParentActor, pNode );
if( pReturn == NULL )
goto all_done;
} }
all_done:
return pReturn; return pReturn;
} }
@@ -191,7 +175,12 @@ all_done:
static void MergeActorXML( XNode *pChild, const XNode *pParent ) static void MergeActorXML( XNode *pChild, const XNode *pParent )
{ {
FOREACH_CONST_Child( pParent, p ) FOREACH_CONST_Child( pParent, p )
{
LOG->Trace( "append 1: \"%s\"",
XmlFileUtil::GetXML(p).c_str() );
pChild->AppendChild( new XNode(*p) ); pChild->AppendChild( new XNode(*p) );
}
FOREACH_CONST_Attr( pParent, p ) FOREACH_CONST_Attr( pParent, p )
{ {
@@ -199,7 +188,7 @@ static void MergeActorXML( XNode *pChild, const XNode *pParent )
if( !EndsWith(sName, "Command") ) if( !EndsWith(sName, "Command") )
continue; continue;
if( pChild->GetAttr(p->first) != NULL ) // if( pChild->GetAttr(p->first) != NULL )
{ {
RString sWarning = RString sWarning =
ssprintf( "%s: overriding \"%s\" in %s node \"%s\"", ssprintf( "%s: overriding \"%s\" in %s node \"%s\"",