From ed1ff5c63c9b92cff3fe592ee76262869c89420d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 8 Sep 2005 03:38:08 +0000 Subject: [PATCH] fix up screen command loading --- stepmania/src/ActorUtil.cpp | 9 +++++++-- stepmania/src/ActorUtil.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index c56ac56fea..50204fdeea 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -309,7 +309,12 @@ void ActorUtil::SetXY( Actor& actor, const CString &sType ) void ActorUtil::LoadCommand( Actor& actor, const CString &sType, const CString &sCommandName ) { - actor.AddCommand( sCommandName, THEME->GetMetricA(sType,actor.GetName()+sCommandName+"Command") ); + ActorUtil::LoadCommandFromName( actor, sType, sCommandName, actor.GetName() ); +} + +void ActorUtil::LoadCommandFromName( Actor& actor, const CString &sType, const CString &sCommandName, const CString &sName ) +{ + actor.AddCommand( sCommandName, THEME->GetMetricA(sType,sName+sCommandName+"Command") ); } void ActorUtil::LoadAndPlayCommand( Actor& actor, const CString &sType, const CString &sCommandName, Actor* pParent ) @@ -359,7 +364,7 @@ void ActorUtil::LoadAllCommandsFromName( Actor& actor, const CString &sType, con if( sv.Right(7) == "Command" ) { CString sCommandName( sv.begin()+sName.size(), sv.end()-7 ); - LoadCommand( actor, sType, sCommandName ); + LoadCommandFromName( actor, sType, sCommandName, sName ); } } } diff --git a/stepmania/src/ActorUtil.h b/stepmania/src/ActorUtil.h index dd25c81607..8df314fffe 100644 --- a/stepmania/src/ActorUtil.h +++ b/stepmania/src/ActorUtil.h @@ -46,6 +46,7 @@ namespace ActorUtil void SetXY( Actor& actor, const CString &sType ); void LoadCommand( Actor& actor, const CString &sType, const CString &sCommandName ); + void LoadCommandFromName( Actor& actor, const CString &sType, const CString &sCommandName, const CString &sName ); void LoadAndPlayCommand( Actor& actor, const CString &sType, const CString &sCommandName, Actor* pParent = NULL ); void LoadAllCommands( Actor& actor, const CString &sType ); void LoadAllCommandsFromName( Actor& actor, const CString &sType, const CString &sName );