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

fix commands being parsed multiple times; eg. OnCommand=@'"x," .. foo()' can only run foo() once

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-23 00:22:23 +00:00
parent cdfb4cff1e
commit dfce58ed98
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+3
View File
@@ -91,6 +91,7 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sAniDir, const XNode* pNode
BGAnimation *p = new BGAnimation; BGAnimation *p = new BGAnimation;
p->LoadFromNode( sAniDir, pNode ); p->LoadFromNode( sAniDir, pNode );
pActor = p; pActor = p;
return pActor; // we just ran LoadFromNode; don't run it again below
} }
else if( else if(
sType == "GenreDisplay" || sType == "GenreDisplay" ||
@@ -104,6 +105,7 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sAniDir, const XNode* pNode
ActorFrame *p = new ActorFrame; ActorFrame *p = new ActorFrame;
p->LoadFromNode( sAniDir, pNode ); p->LoadFromNode( sAniDir, pNode );
pActor = p; pActor = p;
return pActor; // we just ran LoadFromNode; don't run it again below
} }
else if( sType == "BitmapText" ) else if( sType == "BitmapText" )
{ {
@@ -293,6 +295,7 @@ retry:
ASSERT( pActor ); // we should have filled this in above ASSERT( pActor ); // we should have filled this in above
// TODO: LoadFromNode should be called when we still have a pointer to the derived type. // TODO: LoadFromNode should be called when we still have a pointer to the derived type.
// (Why isn't it virtual?)
pActor->LoadFromNode( sAniDir, pNode ); pActor->LoadFromNode( sAniDir, pNode );
return pActor; return pActor;