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

Bump Util commands out of the header.

Browse Source
This commit is contained in:
Glenn Maynard
2003-10-31 00:50:06 +00:00
parent a0b4b80a03
commit c5086b20eb
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+37 -2
View File
@@ -15,6 +15,7 @@
#include "Sprite.h"
#include "BitmapText.h"
#include "Model.h"
#include "BGAnimation.h"
#include "IniFile.h"
#include "ThemeManager.h"
#include "RageUtil_FileDB.h"
@@ -90,7 +91,6 @@ Actor* MakeActor( RageTextureID ID )
CString sExt = GetExtension( ID.filename );
sExt.MakeLower();
if( sExt=="actor" )
{
return LoadActor( ID.filename );
@@ -114,7 +114,14 @@ Actor* MakeActor( RageTextureID ID )
pModel->LoadMilkshapeAscii( ID.filename );
return pModel;
}
/* Do this last, to avoid the IsADirectory in most cases. */
else if( IsADirectory(ID.filename) )
{
BGAnimation *pBGA = new BGAnimation;
pBGA->LoadFromAniDir( ID.filename );
return pBGA;
}
else
RageException::Throw("File \"%s\" has unknown type, \"%s\"",
ID.filename.c_str(), sExt.c_str() );
}
@@ -127,3 +134,31 @@ void IncorrectActorParametersWarning( const CStringArray &asTokens, int iMaxInde
if( DISPLAY->IsWindowed() )
HOOKS->MessageBoxOK( sError );
}
void UtilSetXY( Actor& actor, CString sClassName )
{
ASSERT( !actor.GetName().empty() );
actor.SetXY( THEME->GetMetricF(sClassName,actor.GetName()+"X"), THEME->GetMetricF(sClassName,actor.GetName()+"Y") );
}
float UtilCommand( Actor& actor, CString sClassName, CString sCommandName )
{
ASSERT( !actor.GetName().empty() );
return actor.Command( THEME->GetMetric(sClassName,actor.GetName()+sCommandName+"Command") );
}
float UtilOnCommand( Actor& actor, CString sClassName )
{
ASSERT( !actor.GetName().empty() );
return actor.Command( THEME->GetMetric(sClassName,actor.GetName()+"OnCommand") );
}
float UtilOffCommand( Actor& actor, CString sClassName )
{
// HACK: It's very often that we command things to TweenOffScreen
// that we aren't drawing. We know that an Actor is not being
// used if it's name is blank. So, do nothing on Actors with a blank name.
if( actor.GetName().empty() )
return 0;
return actor.Command( THEME->GetMetric(sClassName,actor.GetName()+"OffCommand") );
}