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

fix x/y set in InitCommand sometimes overridden

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-21 17:45:34 +00:00
parent a288441843
commit 35b1059e05
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+9 -1
View File
@@ -292,7 +292,15 @@ void ActorUtil::SetXY( Actor& actor, const CString &sType )
if( !actor.HasCommand("On") ) // this actor hasn't loaded commands yet if( !actor.HasCommand("On") ) // this actor hasn't loaded commands yet
LoadAllCommands( actor, sType ); LoadAllCommands( actor, sType );
actor.SetXY( THEME->GetMetricF(sType,actor.GetName()+"X"), THEME->GetMetricF(sType,actor.GetName()+"Y") ); /*
* Hack: This is run after InitCommand, and InitCommand might set X/Y. If
* these are both 0, leave the actor where it is. If InitCommand doesn't,
* then 0,0 is the default, anyway.
*/
float fX = THEME->GetMetricF(sType,actor.GetName()+"X");
float fY = THEME->GetMetricF(sType,actor.GetName()+"Y");
if( fX != 0 || fY != 0 )
actor.SetXY( fX, fY );
} }
void ActorUtil::LoadCommand( Actor& actor, const CString &sType, const CString &sCommandName ) void ActorUtil::LoadCommand( Actor& actor, const CString &sType, const CString &sCommandName )