From ced8fd4561a78d9d20a5037ea905ca3e598bde7e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 15 Jan 2006 19:04:34 +0000 Subject: [PATCH] Transition away from Screen(sName). --- stepmania/src/ScreenNetRoom.cpp | 8 +++----- stepmania/src/ScreenNetRoom.h | 1 - stepmania/src/ScreenNetSelectBase.cpp | 5 +---- stepmania/src/ScreenNetSelectBase.h | 1 - stepmania/src/ScreenNetSelectMusic.cpp | 10 ++++------ stepmania/src/ScreenNetSelectMusic.h | 1 - stepmania/src/ScreenPackages.cpp | 5 +---- stepmania/src/ScreenPackages.h | 1 - stepmania/src/ScreenPrompt.cpp | 6 +----- stepmania/src/ScreenPrompt.h | 1 - stepmania/src/ScreenSaveSync.cpp | 6 ++++-- stepmania/src/ScreenSaveSync.h | 2 +- stepmania/src/ScreenSelectCharacter.cpp | 5 +---- stepmania/src/ScreenSelectCharacter.h | 1 - stepmania/src/ScreenSelectGroup.cpp | 5 +---- stepmania/src/ScreenSelectGroup.h | 1 - stepmania/src/ScreenServiceAction.cpp | 6 ++++-- stepmania/src/ScreenServiceAction.h | 2 +- stepmania/src/ScreenSetTime.cpp | 5 +---- stepmania/src/ScreenSetTime.h | 1 - stepmania/src/ScreenTestInput.cpp | 5 +---- stepmania/src/ScreenTestInput.h | 1 - stepmania/src/ScreenTestLights.cpp | 8 +++----- stepmania/src/ScreenTestLights.h | 1 - stepmania/src/ScreenTextEntry.cpp | 7 +------ stepmania/src/ScreenTextEntry.h | 1 - 26 files changed, 28 insertions(+), 68 deletions(-) diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp index 793e9a4a72..2c2eb011c7 100644 --- a/stepmania/src/ScreenNetRoom.cpp +++ b/stepmania/src/ScreenNetRoom.cpp @@ -28,14 +28,12 @@ AutoScreenMessage( SM_SMOnlinePack ) AutoScreenMessage( SM_BackFromRoomName ) AutoScreenMessage( SM_BackFromRoomDesc ) -REGISTER_SCREEN_CLASS( ScreenNetRoom ); -ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sName ) -{ - GAMESTATE->FinishStage(); -} +REGISTER_SCREEN_CLASS_NEW( ScreenNetRoom ); void ScreenNetRoom::Init() { + GAMESTATE->FinishStage(); + ScreenNetSelectBase::Init(); m_soundChangeSel.Load( THEME->GetPathS("ScreenNetRoom","change sel")); diff --git a/stepmania/src/ScreenNetRoom.h b/stepmania/src/ScreenNetRoom.h index d27270708e..1006f74ae0 100644 --- a/stepmania/src/ScreenNetRoom.h +++ b/stepmania/src/ScreenNetRoom.h @@ -25,7 +25,6 @@ private: class ScreenNetRoom : public ScreenNetSelectBase { public: - ScreenNetRoom( const CString& sName ); virtual void Init(); virtual void Input( const InputEventPlus &input ); virtual void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenNetSelectBase.cpp b/stepmania/src/ScreenNetSelectBase.cpp index d7500ac9b5..ef6f398304 100644 --- a/stepmania/src/ScreenNetSelectBase.cpp +++ b/stepmania/src/ScreenNetSelectBase.cpp @@ -32,10 +32,7 @@ AutoScreenMessage( SM_AddToChat ) AutoScreenMessage( SM_UsersUpdate ) AutoScreenMessage( SM_SMOnlinePack ) -REGISTER_SCREEN_CLASS( ScreenNetSelectBase ); -ScreenNetSelectBase::ScreenNetSelectBase( const CString& sName ) : ScreenWithMenuElements( sName ) -{ -} +REGISTER_SCREEN_CLASS_NEW( ScreenNetSelectBase ); void ScreenNetSelectBase::Init() { diff --git a/stepmania/src/ScreenNetSelectBase.h b/stepmania/src/ScreenNetSelectBase.h index 34b3a79759..ced1179d3c 100644 --- a/stepmania/src/ScreenNetSelectBase.h +++ b/stepmania/src/ScreenNetSelectBase.h @@ -11,7 +11,6 @@ class ScreenNetSelectBase : public ScreenWithMenuElements { public: - ScreenNetSelectBase( const CString& sName ); virtual void Init(); void Input( const InputEventPlus &input ); diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 3dcd4988bc..7428561973 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -37,15 +37,13 @@ const CString AllGroups = "[ALL MUSIC]"; #define DIFFBG_WIDTH THEME->GetMetricF(m_sName,"DiffBGWidth") #define DIFFBG_HEIGHT THEME->GetMetricF(m_sName,"DiffBGHeight") -REGISTER_SCREEN_CLASS( ScreenNetSelectMusic ); -ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSelectBase( sName ) -{ - /* Finish any previous stage. It's OK to call this when we havn't played a stage yet. */ - GAMESTATE->FinishStage(); -} +REGISTER_SCREEN_CLASS_NEW( ScreenNetSelectMusic ); void ScreenNetSelectMusic::Init() { + /* Finish any previous stage. It's OK to call this when we havn't played a stage yet. */ + GAMESTATE->FinishStage(); + ScreenNetSelectBase::Init(); //Diff Icon background diff --git a/stepmania/src/ScreenNetSelectMusic.h b/stepmania/src/ScreenNetSelectMusic.h index dbd19ea844..f4e8b1b214 100644 --- a/stepmania/src/ScreenNetSelectMusic.h +++ b/stepmania/src/ScreenNetSelectMusic.h @@ -21,7 +21,6 @@ class ScreenNetSelectMusic : public ScreenNetSelectBase { public: - ScreenNetSelectMusic( const CString& sName ); virtual void Init(); virtual void Input( const InputEventPlus &input ); diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp index 7ca568a057..b670f50540 100644 --- a/stepmania/src/ScreenPackages.cpp +++ b/stepmania/src/ScreenPackages.cpp @@ -21,10 +21,7 @@ AutoScreenMessage( SM_BackFromURL ) -REGISTER_SCREEN_CLASS( ScreenPackages ); -ScreenPackages::ScreenPackages( CString sClassName ) : ScreenWithMenuElements( sClassName ) -{ -} +REGISTER_SCREEN_CLASS_NEW( ScreenPackages ); void ScreenPackages::Init() { diff --git a/stepmania/src/ScreenPackages.h b/stepmania/src/ScreenPackages.h index c4b882138c..f1710ce020 100644 --- a/stepmania/src/ScreenPackages.h +++ b/stepmania/src/ScreenPackages.h @@ -12,7 +12,6 @@ class ScreenPackages : public ScreenWithMenuElements { public: - ScreenPackages( CString sName ); virtual void Init(); virtual void Input( const InputEventPlus &input ); diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index 78d0148b5a..a34f6a0c94 100644 --- a/stepmania/src/ScreenPrompt.cpp +++ b/stepmania/src/ScreenPrompt.cpp @@ -45,11 +45,7 @@ void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const CString &sText, Prom -REGISTER_SCREEN_CLASS( ScreenPrompt ); -ScreenPrompt::ScreenPrompt( const CString &sScreenName ): - ScreenWithMenuElements( sScreenName ) -{ -} +REGISTER_SCREEN_CLASS_NEW( ScreenPrompt ); void ScreenPrompt::Init() { diff --git a/stepmania/src/ScreenPrompt.h b/stepmania/src/ScreenPrompt.h index 353f82cd1c..83bb5bf028 100644 --- a/stepmania/src/ScreenPrompt.h +++ b/stepmania/src/ScreenPrompt.h @@ -28,7 +28,6 @@ public: static void SetPromptSettings( const CString &sText, PromptType type = PROMPT_OK, PromptAnswer defaultAnswer = ANSWER_NO, void(*OnYes)(void*) = NULL, void(*OnNo)(void*) = NULL, void* pCallbackData = NULL ); static void Prompt( ScreenMessage smSendOnPop, const CString &sText, PromptType type = PROMPT_OK, PromptAnswer defaultAnswer = ANSWER_NO, void(*OnYes)(void*) = NULL, void(*OnNo)(void*) = NULL, void* pCallbackData = NULL ); - ScreenPrompt( const CString &sScreenName ); virtual void Init(); virtual void BeginScreen(); virtual void Input( const InputEventPlus &input ); diff --git a/stepmania/src/ScreenSaveSync.cpp b/stepmania/src/ScreenSaveSync.cpp index ef247c7cce..a91d3fc90e 100644 --- a/stepmania/src/ScreenSaveSync.cpp +++ b/stepmania/src/ScreenSaveSync.cpp @@ -115,9 +115,11 @@ static void RevertSyncChanges( void* pThrowAway ) GAMESTATE->RevertSyncChanges(); } -REGISTER_SCREEN_CLASS( ScreenSaveSync ); -ScreenSaveSync::ScreenSaveSync( CString sClassName ) : ScreenPrompt( sClassName ) +REGISTER_SCREEN_CLASS_NEW( ScreenSaveSync ); +void ScreenSaveSync::Init() { + ScreenPrompt::Init(); + ScreenPrompt::SetPromptSettings( GetPromptText(), PROMPT_YES_NO, diff --git a/stepmania/src/ScreenSaveSync.h b/stepmania/src/ScreenSaveSync.h index 231198f732..c5af483f58 100644 --- a/stepmania/src/ScreenSaveSync.h +++ b/stepmania/src/ScreenSaveSync.h @@ -8,7 +8,7 @@ class ScreenSaveSync : public ScreenPrompt { public: - ScreenSaveSync( CString sName ); + virtual void Init(); static void PromptSaveSync(); }; diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index ef8c4750f5..9a90ae637b 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -46,10 +46,7 @@ const PlayerNumber CPU_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 }; -REGISTER_SCREEN_CLASS( ScreenSelectCharacter ); -ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithMenuElements( sClassName ) -{ -} +REGISTER_SCREEN_CLASS_NEW( ScreenSelectCharacter ); void ScreenSelectCharacter::Init() diff --git a/stepmania/src/ScreenSelectCharacter.h b/stepmania/src/ScreenSelectCharacter.h index ae3f47becb..24a82e2706 100644 --- a/stepmania/src/ScreenSelectCharacter.h +++ b/stepmania/src/ScreenSelectCharacter.h @@ -16,7 +16,6 @@ class ScreenSelectCharacter : public ScreenWithMenuElements { public: - ScreenSelectCharacter( CString sName ); virtual void Init(); virtual ~ScreenSelectCharacter(); diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 75a7fb1dcd..1a0c06aaa9 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -22,10 +22,7 @@ #define BANNER_HEIGHT THEME->GetMetricF("ScreenSelectGroup","BannerHeight") -REGISTER_SCREEN_CLASS( ScreenSelectGroup ); -ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuElements( sClassName ) -{ -} +REGISTER_SCREEN_CLASS_NEW( ScreenSelectGroup ); static LocalizedString ALL_MUSIC_STRING( "ScreenSelectGroup", "ALL MUSIC" ); void ScreenSelectGroup::Init() diff --git a/stepmania/src/ScreenSelectGroup.h b/stepmania/src/ScreenSelectGroup.h index febe98fc5c..0a972064ac 100644 --- a/stepmania/src/ScreenSelectGroup.h +++ b/stepmania/src/ScreenSelectGroup.h @@ -14,7 +14,6 @@ class ScreenSelectGroup : public ScreenWithMenuElements { public: - ScreenSelectGroup( CString sName ); virtual void Init(); virtual void Input( const InputEventPlus &input ); diff --git a/stepmania/src/ScreenServiceAction.cpp b/stepmania/src/ScreenServiceAction.cpp index 220c111c8f..4923786677 100644 --- a/stepmania/src/ScreenServiceAction.cpp +++ b/stepmania/src/ScreenServiceAction.cpp @@ -448,9 +448,11 @@ static CString ResetPreferences() -REGISTER_SCREEN_CLASS( ScreenServiceAction ); -ScreenServiceAction::ScreenServiceAction( CString sClassName ) : ScreenPrompt( sClassName ) +REGISTER_SCREEN_CLASS_NEW( ScreenServiceAction ); +void ScreenServiceAction::Init() { + ScreenPrompt::Init(); + CString sAction = THEME->GetMetric(m_sName,"Action"); CString (*pfn)() = NULL; diff --git a/stepmania/src/ScreenServiceAction.h b/stepmania/src/ScreenServiceAction.h index bbfee28674..424ca395df 100644 --- a/stepmania/src/ScreenServiceAction.h +++ b/stepmania/src/ScreenServiceAction.h @@ -8,7 +8,7 @@ class ScreenServiceAction : public ScreenPrompt { public: - ScreenServiceAction( CString sName ); + virtual void Init(); }; diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp index 2bd9c16fa8..ffc5546131 100644 --- a/stepmania/src/ScreenSetTime.cpp +++ b/stepmania/src/ScreenSetTime.cpp @@ -37,10 +37,7 @@ static float GetTitleY( SetTimeSelection s ) { return g_Y[s]; } static float GetValueX( SetTimeSelection s ) { return g_X[s] + 80; } static float GetValueY( SetTimeSelection s ) { return g_Y[s]; } -REGISTER_SCREEN_CLASS( ScreenSetTime ); -ScreenSetTime::ScreenSetTime( CString sClassName ) : ScreenWithMenuElements( sClassName ) -{ -} +REGISTER_SCREEN_CLASS_NEW( ScreenSetTime ); void ScreenSetTime::Init() { diff --git a/stepmania/src/ScreenSetTime.h b/stepmania/src/ScreenSetTime.h index 99e82716f2..80a8bed785 100644 --- a/stepmania/src/ScreenSetTime.h +++ b/stepmania/src/ScreenSetTime.h @@ -18,7 +18,6 @@ enum SetTimeSelection class ScreenSetTime : public ScreenWithMenuElements { public: - ScreenSetTime( CString sName ); virtual void Init(); virtual void Update( float fDelta ); diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp index 324dacf2d6..c1b4102674 100644 --- a/stepmania/src/ScreenTestInput.cpp +++ b/stepmania/src/ScreenTestInput.cpp @@ -14,10 +14,7 @@ #include "LocalizedString.h" -REGISTER_SCREEN_CLASS( ScreenTestInput ); -ScreenTestInput::ScreenTestInput( CString sClassName ) : ScreenWithMenuElements( sClassName ) -{ -} +REGISTER_SCREEN_CLASS_NEW( ScreenTestInput ); void ScreenTestInput::Init() { diff --git a/stepmania/src/ScreenTestInput.h b/stepmania/src/ScreenTestInput.h index 3e9a35fd2a..e92e5047f5 100644 --- a/stepmania/src/ScreenTestInput.h +++ b/stepmania/src/ScreenTestInput.h @@ -10,7 +10,6 @@ class ScreenTestInput : public ScreenWithMenuElements { public: - ScreenTestInput( CString sName ); virtual void Init(); virtual ~ScreenTestInput(); diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp index 716cfd79ce..1044f53e77 100644 --- a/stepmania/src/ScreenTestLights.cpp +++ b/stepmania/src/ScreenTestLights.cpp @@ -11,14 +11,12 @@ #include "InputEventPlus.h" #include "LocalizedString.h" -REGISTER_SCREEN_CLASS( ScreenTestLights ); -ScreenTestLights::ScreenTestLights( CString sClassName ) : ScreenWithMenuElements( sClassName ) -{ - LIGHTSMAN->SetLightsMode( LIGHTSMODE_TEST_AUTO_CYCLE ); -} +REGISTER_SCREEN_CLASS_NEW( ScreenTestLights ); void ScreenTestLights::Init() { + LIGHTSMAN->SetLightsMode( LIGHTSMODE_TEST_AUTO_CYCLE ); + ScreenWithMenuElements::Init(); m_textInputs.SetName( "Text" ); diff --git a/stepmania/src/ScreenTestLights.h b/stepmania/src/ScreenTestLights.h index 74d5271a1e..03e5630f11 100644 --- a/stepmania/src/ScreenTestLights.h +++ b/stepmania/src/ScreenTestLights.h @@ -8,7 +8,6 @@ class ScreenTestLights : public ScreenWithMenuElements { public: - ScreenTestLights( CString sName ); virtual void Init(); virtual ~ScreenTestLights(); diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index 61ab526409..03ecccff37 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -71,12 +71,7 @@ bool ScreenTextEntry::s_bCancelledLast = false; * XXX: Don't allow internal-use codepoints (above 0xFFFF); those are * subject to change and shouldn't be written to disk. */ -REGISTER_SCREEN_CLASS( ScreenTextEntry ); - -ScreenTextEntry::ScreenTextEntry( CString sClassName ) : - ScreenWithMenuElements( sClassName ) -{ -} +REGISTER_SCREEN_CLASS_NEW( ScreenTextEntry ); void ScreenTextEntry::Init() { diff --git a/stepmania/src/ScreenTextEntry.h b/stepmania/src/ScreenTextEntry.h index 3370fb3c93..5071c94006 100644 --- a/stepmania/src/ScreenTextEntry.h +++ b/stepmania/src/ScreenTextEntry.h @@ -41,7 +41,6 @@ public: TextEntry( smSendOnPop, sQuestion, "", 255, NULL, OnOK, OnCanel, true ); } - ScreenTextEntry( CString sName ); ~ScreenTextEntry(); virtual void Init(); virtual void BeginScreen();