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

m_sName for ScreenAttract::StartScreen

Browse Source
This commit is contained in:
Glenn Maynard
2005-03-17 07:23:59 +00:00
parent c45e197858
commit 008cae2479
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenAttract.cpp
+4 -4
View File
@@ -17,7 +17,7 @@
#include "BGAnimation.h" #include "BGAnimation.h"
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") #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 ); REGISTER_SCREEN_CLASS( ScreenAttract );
@@ -49,10 +49,10 @@ void ScreenAttract::Input( const DeviceInput& DeviceI, const InputEventType type
{ {
// LOG->Trace( "ScreenAttract::Input()" ); // 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) if(type != IET_FIRST_PRESS)
return; // don't care return; // don't care
@@ -82,7 +82,7 @@ void ScreenAttract::AttractInput( const DeviceInput& DeviceI, const InputEventTy
SCREENMAN->SendMessageToTopScreen( SM_StopMusic ); SCREENMAN->SendMessageToTopScreen( SM_StopMusic );
usleep( (int)(JOIN_PAUSE_SECONDS*1000*1000) ); // do a little pause, like the arcade does usleep( (int)(JOIN_PAUSE_SECONDS*1000*1000) ); // do a little pause, like the arcade does
LOG->Trace("ScreenAttract::AttractInput: go to START_SCREEN" ); LOG->Trace("ScreenAttract::AttractInput: go to START_SCREEN" );
SCREENMAN->SetNewScreen( START_SCREEN ); SCREENMAN->SetNewScreen( START_SCREEN(sScreenName) );
break; break;
default: default:
ASSERT(0); ASSERT(0);
stepmania/src/ScreenAttract.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
virtual ~ScreenAttract(); virtual ~ScreenAttract();
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); 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 Update( float fDelta );
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
stepmania/src/ScreenJukebox.cpp
+1 -1
View File
@@ -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 ) void ScreenJukebox::HandleScreenMessage( const ScreenMessage SM )