From 544f922c3ac1cb20e38f427d043d83e53e7d9212 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 13 Jul 2007 10:42:42 +0000 Subject: [PATCH] add sType param to Load* --- stepmania/src/ControllerStateDisplay.cpp | 18 +++++++++--------- stepmania/src/ControllerStateDisplay.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/ControllerStateDisplay.cpp b/stepmania/src/ControllerStateDisplay.cpp index 3edeac7ec2..6b7da18fb2 100644 --- a/stepmania/src/ControllerStateDisplay.cpp +++ b/stepmania/src/ControllerStateDisplay.cpp @@ -43,31 +43,31 @@ ControllerStateDisplay::ControllerStateDisplay() m_idsLast = InputDeviceState_Invalid; } -void ControllerStateDisplay::LoadMultiPlayer( MultiPlayer mp ) +void ControllerStateDisplay::LoadMultiPlayer( RString sType, MultiPlayer mp ) { - LoadInternal( mp, GAME_CONTROLLER_1 ); + LoadInternal( sType, mp, GAME_CONTROLLER_1 ); } -void ControllerStateDisplay::LoadGameController( GameController gc ) +void ControllerStateDisplay::LoadGameController( RString sType, GameController gc ) { - LoadInternal( MultiPlayer_Invalid, gc ); + LoadInternal( sType, MultiPlayer_Invalid, gc ); } -void ControllerStateDisplay::LoadInternal( MultiPlayer mp, GameController gc ) +void ControllerStateDisplay::LoadInternal( RString sType, MultiPlayer mp, GameController gc ) { ASSERT( !m_bIsLoaded ); m_bIsLoaded = true; m_mp = mp; LuaThreadVariable varElement( "MultiPlayer", LuaReference::Create(m_mp) ); - m_sprFrame.Load( THEME->GetPathG("ControllerStateDisplay", "frame") ); + m_sprFrame.Load( THEME->GetPathG(sType, "frame") ); this->AddChild( m_sprFrame ); FOREACH_ENUM( ControllerStateButton, b ) { Button &button = m_Buttons[ b ]; - RString sPath = THEME->GetPathG( "ControllerStateDisplay", ControllerStateButtonToString(b) ); + RString sPath = THEME->GetPathG( sType, ControllerStateButtonToString(b) ); button.spr.Load( sPath ); this->AddChild( m_Buttons[b].spr ); @@ -104,8 +104,8 @@ void ControllerStateDisplay::Update( float fDelta ) class LunaControllerStateDisplay: public Luna { public: - static int LoadGameController( T* p, lua_State *L ) { p->LoadGameController( (GameController)IArg(1) ); return 0; } - static int LoadMultiPlayer( T* p, lua_State *L ) { p->LoadMultiPlayer( (MultiPlayer)IArg(1) ); return 0; } + static int LoadGameController( T* p, lua_State *L ) { p->LoadGameController( SArg(1), (GameController)IArg(2) ); return 0; } + static int LoadMultiPlayer( T* p, lua_State *L ) { p->LoadMultiPlayer( SArg(1), (MultiPlayer)IArg(2) ); return 0; } LunaControllerStateDisplay() { diff --git a/stepmania/src/ControllerStateDisplay.h b/stepmania/src/ControllerStateDisplay.h index 5b2b6b9c1f..645019497b 100644 --- a/stepmania/src/ControllerStateDisplay.h +++ b/stepmania/src/ControllerStateDisplay.h @@ -25,8 +25,8 @@ class ControllerStateDisplay : public ActorFrame { public: ControllerStateDisplay(); - void LoadMultiPlayer( MultiPlayer mp ); - void LoadGameController( GameController gc ); + void LoadMultiPlayer( RString sType, MultiPlayer mp ); + void LoadGameController( RString sType, GameController gc ); virtual void Update( float fDelta ); bool IsLoaded() const { return m_bIsLoaded; } @@ -38,7 +38,7 @@ public: virtual void PushSelf( lua_State *L ); protected: - void LoadInternal( MultiPlayer mp, GameController gc ); + void LoadInternal( RString sType, MultiPlayer mp, GameController gc ); MultiPlayer m_mp; bool m_bIsLoaded;