diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp index 5e3be1dbd9..f0c29629a1 100644 --- a/stepmania/src/ScreenAttract.cpp +++ b/stepmania/src/ScreenAttract.cpp @@ -17,7 +17,7 @@ #include "BGAnimation.h" #define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") -#define START_SCREEN THEME->GetMetric ("ScreenAttract","StartScreen") +#define START_SCREEN(sScreenName) THEME->GetMetric (sScreenName,"StartScreen") REGISTER_SCREEN_CLASS( ScreenAttract ); @@ -49,10 +49,10 @@ void ScreenAttract::Input( const DeviceInput& DeviceI, const InputEventType type { // LOG->Trace( "ScreenAttract::Input()" ); - AttractInput( DeviceI, type, GameI, MenuI, StyleI, m_In.IsTransitioning() || m_Out.IsTransitioning() ); + AttractInput( DeviceI, type, GameI, MenuI, StyleI, m_In.IsTransitioning() || m_Out.IsTransitioning(), m_sName ); } -void ScreenAttract::AttractInput( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI, bool bTransitioning ) +void ScreenAttract::AttractInput( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI, bool bTransitioning, CString sScreenName ) { if(type != IET_FIRST_PRESS) return; // don't care @@ -82,7 +82,7 @@ void ScreenAttract::AttractInput( const DeviceInput& DeviceI, const InputEventTy SCREENMAN->SendMessageToTopScreen( SM_StopMusic ); usleep( (int)(JOIN_PAUSE_SECONDS*1000*1000) ); // do a little pause, like the arcade does LOG->Trace("ScreenAttract::AttractInput: go to START_SCREEN" ); - SCREENMAN->SetNewScreen( START_SCREEN ); + SCREENMAN->SetNewScreen( START_SCREEN(sScreenName) ); break; default: ASSERT(0); diff --git a/stepmania/src/ScreenAttract.h b/stepmania/src/ScreenAttract.h index 24dceee2ed..aecaf8a3ea 100644 --- a/stepmania/src/ScreenAttract.h +++ b/stepmania/src/ScreenAttract.h @@ -14,7 +14,7 @@ public: virtual ~ScreenAttract(); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); - static void AttractInput( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI, bool bTransitioning ); + static void AttractInput( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI, bool bTransitioning, CString sScreenName ); virtual void Update( float fDelta ); virtual void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 8ae4205413..c5c96add83 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -215,7 +215,7 @@ void ScreenJukebox::Input( const DeviceInput& DeviceI, const InputEventType type } } - ScreenAttract::AttractInput( DeviceI, type, GameI, MenuI, StyleI, m_Out.IsTransitioning() ); + ScreenAttract::AttractInput( DeviceI, type, GameI, MenuI, StyleI, m_Out.IsTransitioning(), m_sName ); } void ScreenJukebox::HandleScreenMessage( const ScreenMessage SM )