From c15e0cec493de5aa1021334a2a135dfaa2270a86 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 27 Sep 2003 22:30:51 +0000 Subject: [PATCH] Allow screen aliasing. --- stepmania/src/Screen.cpp | 17 ++++++++++++++++- stepmania/src/ScreenAlbums.h | 2 +- stepmania/src/ScreenAppearanceOptions.cpp | 4 ++-- stepmania/src/ScreenAppearanceOptions.h | 2 +- stepmania/src/ScreenAutogenOptions.cpp | 4 ++-- stepmania/src/ScreenAutogenOptions.h | 2 +- stepmania/src/ScreenBackgroundOptions.cpp | 4 ++-- stepmania/src/ScreenBackgroundOptions.h | 2 +- stepmania/src/ScreenCaution.cpp | 2 +- stepmania/src/ScreenCaution.h | 2 +- stepmania/src/ScreenCompany.h | 2 +- stepmania/src/ScreenCredits.cpp | 2 +- stepmania/src/ScreenCredits.h | 2 +- stepmania/src/ScreenDemonstration.cpp | 2 +- stepmania/src/ScreenDemonstration.h | 2 +- stepmania/src/ScreenEdit.cpp | 2 +- stepmania/src/ScreenEdit.h | 2 +- stepmania/src/ScreenEditCoursesMenu.cpp | 2 +- stepmania/src/ScreenEditCoursesMenu.h | 2 +- stepmania/src/ScreenEditMenu.cpp | 2 +- stepmania/src/ScreenEditMenu.h | 2 +- stepmania/src/ScreenEvaluation.h | 14 +++++++------- stepmania/src/ScreenExit.cpp | 2 +- stepmania/src/ScreenExit.h | 2 +- stepmania/src/ScreenEz2SelectMusic.cpp | 2 +- stepmania/src/ScreenEz2SelectMusic.h | 2 +- stepmania/src/ScreenEz2SelectPlayer.cpp | 2 +- stepmania/src/ScreenEz2SelectPlayer.h | 2 +- stepmania/src/ScreenGameOver.cpp | 2 +- stepmania/src/ScreenGameOver.h | 2 +- stepmania/src/ScreenGameplay.cpp | 3 ++- stepmania/src/ScreenGameplay.h | 2 +- stepmania/src/ScreenGameplayOptions.cpp | 4 ++-- stepmania/src/ScreenGameplayOptions.h | 2 +- stepmania/src/ScreenGraphicOptions.cpp | 4 ++-- stepmania/src/ScreenGraphicOptions.h | 2 +- stepmania/src/ScreenHowToPlay.cpp | 2 +- stepmania/src/ScreenHowToPlay.h | 2 +- stepmania/src/ScreenInputOptions.cpp | 4 ++-- stepmania/src/ScreenInputOptions.h | 2 +- stepmania/src/ScreenInstructions.cpp | 2 +- stepmania/src/ScreenInstructions.h | 2 +- stepmania/src/ScreenIntroMovie.h | 2 +- stepmania/src/ScreenJukebox.cpp | 2 +- stepmania/src/ScreenJukebox.h | 2 +- stepmania/src/ScreenJukeboxMenu.cpp | 2 +- stepmania/src/ScreenJukeboxMenu.h | 2 +- stepmania/src/ScreenLogo.cpp | 2 +- stepmania/src/ScreenLogo.h | 2 +- stepmania/src/ScreenMachineOptions.cpp | 4 ++-- stepmania/src/ScreenMachineOptions.h | 2 +- stepmania/src/ScreenManager.cpp | 2 +- stepmania/src/ScreenMapControllers.cpp | 2 +- stepmania/src/ScreenMapControllers.h | 2 +- stepmania/src/ScreenMemoryCard.h | 2 +- stepmania/src/ScreenMiniMenu.h | 2 +- stepmania/src/ScreenMusicScroll.cpp | 2 +- stepmania/src/ScreenMusicScroll.h | 2 +- stepmania/src/ScreenNameEntry.cpp | 2 +- stepmania/src/ScreenNameEntry.h | 2 +- stepmania/src/ScreenOptionsMenu.cpp | 4 ++-- stepmania/src/ScreenOptionsMenu.h | 2 +- stepmania/src/ScreenPlayerOptions.cpp | 4 ++-- stepmania/src/ScreenPlayerOptions.h | 2 +- stepmania/src/ScreenProfileOptions.cpp | 3 +-- stepmania/src/ScreenProfileOptions.h | 2 +- stepmania/src/ScreenPrompt.h | 2 +- stepmania/src/ScreenRanking.cpp | 2 +- stepmania/src/ScreenRanking.h | 2 +- stepmania/src/ScreenRaveOptions.cpp | 3 +-- stepmania/src/ScreenRaveOptions.h | 2 +- stepmania/src/ScreenSandbox.cpp | 2 +- stepmania/src/ScreenSandbox.h | 2 +- stepmania/src/ScreenSelectCharacter.cpp | 2 +- stepmania/src/ScreenSelectCharacter.h | 2 +- stepmania/src/ScreenSelectCourse.cpp | 2 +- stepmania/src/ScreenSelectCourse.h | 2 +- stepmania/src/ScreenSelectDifficulty.cpp | 2 +- stepmania/src/ScreenSelectDifficulty.h | 2 +- stepmania/src/ScreenSelectDifficultyEX.cpp | 2 +- stepmania/src/ScreenSelectDifficultyEX.h | 2 +- stepmania/src/ScreenSelectGame.cpp | 4 ++-- stepmania/src/ScreenSelectGame.h | 2 +- stepmania/src/ScreenSelectGroup.cpp | 2 +- stepmania/src/ScreenSelectGroup.h | 2 +- stepmania/src/ScreenSelectMaster.cpp | 2 +- stepmania/src/ScreenSelectMaster.h | 4 +++- stepmania/src/ScreenSelectMode.cpp | 2 +- stepmania/src/ScreenSelectMode.h | 2 +- stepmania/src/ScreenSelectMusic.cpp | 2 +- stepmania/src/ScreenSelectMusic.h | 2 +- stepmania/src/ScreenSelectStyle.cpp | 2 +- stepmania/src/ScreenSelectStyle.h | 2 +- stepmania/src/ScreenSongOptions.cpp | 4 ++-- stepmania/src/ScreenSongOptions.h | 2 +- stepmania/src/ScreenSoundOptions.cpp | 4 ++-- stepmania/src/ScreenSoundOptions.h | 2 +- stepmania/src/ScreenStage.cpp | 2 +- stepmania/src/ScreenStage.h | 2 +- stepmania/src/ScreenStyleSplash.cpp | 2 +- stepmania/src/ScreenStyleSplash.h | 2 +- stepmania/src/ScreenTest.cpp | 8 ++++---- stepmania/src/ScreenTest.h | 2 +- stepmania/src/ScreenTestFonts.cpp | 2 +- stepmania/src/ScreenTestFonts.h | 2 +- stepmania/src/ScreenTestSound.cpp | 2 +- stepmania/src/ScreenTestSound.h | 2 +- stepmania/src/ScreenTextEntry.cpp | 4 ++-- stepmania/src/ScreenTextEntry.h | 2 +- stepmania/src/ScreenTitleMenu.cpp | 2 +- stepmania/src/ScreenTitleMenu.h | 2 +- stepmania/src/ScreenUnlock.cpp | 2 +- stepmania/src/ScreenUnlock.h | 2 +- stepmania/src/ScreenWarning.h | 2 +- 114 files changed, 154 insertions(+), 138 deletions(-) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index 8c7e784f41..134b45d4e8 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -302,7 +302,22 @@ void Screen::ClearMessageQueue( const ScreenMessage SM ) Screen* Screen::Create( CString sClassName ) { -#define IF_RETURN(X) if(sClassName.CompareNoCase(#X)==0) return new X; + /* "ScreenCompany@ScreenOtherCompany" loads ScreenCompany with the + * asset "ScreenOtherCompany", so (if it supports it) it'll use + * metric, graphic, etc. names starting with "ScreenOtherCompany". */ + CStringArray parts; + split( sClassName, "@", parts ); + if( parts.size() != 1 && parts.size() != 2 ) + RageException::Throw("Bad Screen name \"%s\"", sClassName.c_str() ); + + CString sName = sClassName; + if( parts.size() == 2 ) + { + sClassName = parts[0]; + sName = parts[1]; + } + +#define IF_RETURN(X) if(sClassName.CompareNoCase(#X)==0) return new X(sName); IF_RETURN( ScreenAppearanceOptions ); IF_RETURN( ScreenCaution ); diff --git a/stepmania/src/ScreenAlbums.h b/stepmania/src/ScreenAlbums.h index 7a788c573b..4d7ace67e7 100644 --- a/stepmania/src/ScreenAlbums.h +++ b/stepmania/src/ScreenAlbums.h @@ -15,7 +15,7 @@ class ScreenAlbums : public ScreenAttract { public: - ScreenAlbums() : ScreenAttract("ScreenAlbums") { }; + ScreenAlbums( CString sName ) : ScreenAttract(sName) { }; }; diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp index 237b980e02..fe9cc9ed03 100644 --- a/stepmania/src/ScreenAppearanceOptions.cpp +++ b/stepmania/src/ScreenAppearanceOptions.cpp @@ -63,8 +63,8 @@ OptionRow g_AppearanceOptionsLines[NUM_APPEARANCE_OPTIONS_LINES] = { OptionRow( "Lyrics", true, "HIDE","SHOW"), }; -ScreenAppearanceOptions::ScreenAppearanceOptions() : - ScreenOptions("ScreenAppearanceOptions") +ScreenAppearanceOptions::ScreenAppearanceOptions( CString sName ) : + ScreenOptions(sName) { LOG->Trace( "ScreenAppearanceOptions::ScreenAppearanceOptions()" ); diff --git a/stepmania/src/ScreenAppearanceOptions.h b/stepmania/src/ScreenAppearanceOptions.h index a0a09f3d7a..0eced376cf 100644 --- a/stepmania/src/ScreenAppearanceOptions.h +++ b/stepmania/src/ScreenAppearanceOptions.h @@ -16,7 +16,7 @@ class ScreenAppearanceOptions : public ScreenOptions { public: - ScreenAppearanceOptions(); + ScreenAppearanceOptions( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenAutogenOptions.cpp b/stepmania/src/ScreenAutogenOptions.cpp index d568922cb4..e20a7b7c81 100644 --- a/stepmania/src/ScreenAutogenOptions.cpp +++ b/stepmania/src/ScreenAutogenOptions.cpp @@ -33,8 +33,8 @@ OptionRow g_AutogenOptionsLines[NUM_AUTOGEN_OPTIONS_LINES] = { OptionRow( "Autogen\nGroup Courses", true, "OFF","ON" ), }; -ScreenAutogenOptions::ScreenAutogenOptions() : - ScreenOptions("ScreenAutogenOptions") +ScreenAutogenOptions::ScreenAutogenOptions( CString sName ) : + ScreenOptions( sName ) { LOG->Trace( "ScreenAutogenOptions::ScreenAutogenOptions()" ); diff --git a/stepmania/src/ScreenAutogenOptions.h b/stepmania/src/ScreenAutogenOptions.h index 168785955e..c51b90f820 100644 --- a/stepmania/src/ScreenAutogenOptions.h +++ b/stepmania/src/ScreenAutogenOptions.h @@ -16,7 +16,7 @@ class ScreenAutogenOptions : public ScreenOptions { public: - ScreenAutogenOptions(); + ScreenAutogenOptions( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenBackgroundOptions.cpp b/stepmania/src/ScreenBackgroundOptions.cpp index 76729be4d2..a0590ed47f 100644 --- a/stepmania/src/ScreenBackgroundOptions.cpp +++ b/stepmania/src/ScreenBackgroundOptions.cpp @@ -42,8 +42,8 @@ OptionRow g_BackgroundOptionsLines[NUM_BACKGROUND_OPTIONS_LINES] = { OptionRow( "Random\nBackgrounds", true, "5","10","15","20" ), }; -ScreenBackgroundOptions::ScreenBackgroundOptions() : - ScreenOptions("ScreenBackgroundOptions") +ScreenBackgroundOptions::ScreenBackgroundOptions( CString sName ) : + ScreenOptions( sName ) { LOG->Trace( "ScreenBackgroundOptions::ScreenBackgroundOptions()" ); diff --git a/stepmania/src/ScreenBackgroundOptions.h b/stepmania/src/ScreenBackgroundOptions.h index 5ce1494bf8..7542dc9c4e 100644 --- a/stepmania/src/ScreenBackgroundOptions.h +++ b/stepmania/src/ScreenBackgroundOptions.h @@ -14,7 +14,7 @@ class ScreenBackgroundOptions : public ScreenOptions { public: - ScreenBackgroundOptions(); + ScreenBackgroundOptions( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index db5ebb645f..81599547aa 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/stepmania/src/ScreenCaution.cpp @@ -27,7 +27,7 @@ const ScreenMessage SM_DoneOpening = ScreenMessage(SM_User-7); const ScreenMessage SM_StartClosing = ScreenMessage(SM_User-8); -ScreenCaution::ScreenCaution() : Screen( "ScreenCaution" ) +ScreenCaution::ScreenCaution( CString sName ) : Screen( sName ) { GAMESTATE->m_bPlayersCanJoin = true; diff --git a/stepmania/src/ScreenCaution.h b/stepmania/src/ScreenCaution.h index acd4b543dd..8021db08bc 100644 --- a/stepmania/src/ScreenCaution.h +++ b/stepmania/src/ScreenCaution.h @@ -22,7 +22,7 @@ class ScreenCaution : public Screen { public: - ScreenCaution(); + ScreenCaution( CString sName ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenCompany.h b/stepmania/src/ScreenCompany.h index d351771ea0..b104fc853e 100644 --- a/stepmania/src/ScreenCompany.h +++ b/stepmania/src/ScreenCompany.h @@ -15,7 +15,7 @@ class ScreenCompany : public ScreenAttract { public: - ScreenCompany() : ScreenAttract("ScreenCompany") { }; + ScreenCompany( CString sName ) : ScreenAttract( sName ) { } }; diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index 64ed479487..7132c94bf0 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -165,7 +165,7 @@ const CreditLine CREDIT_LINES[] = const unsigned NUM_CREDIT_LINES = sizeof(CREDIT_LINES) / sizeof(CreditLine); -ScreenCredits::ScreenCredits() : Screen("ScreenCredits") +ScreenCredits::ScreenCredits( CString sName ) : Screen( sName ) { LOG->Trace( "ScreenCredits::ScreenCredits()" ); diff --git a/stepmania/src/ScreenCredits.h b/stepmania/src/ScreenCredits.h index cb734412bb..0bc146b74e 100644 --- a/stepmania/src/ScreenCredits.h +++ b/stepmania/src/ScreenCredits.h @@ -17,7 +17,7 @@ class ScreenCredits : public Screen { public: - ScreenCredits(); + ScreenCredits( CString sName ); ~ScreenCredits(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index 3b37b81838..9abf18ed13 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -47,7 +47,7 @@ bool PrepareForDemonstration() // always return true. return true; } -ScreenDemonstration::ScreenDemonstration() : ScreenJukebox( PrepareForDemonstration() ) // this is a hack to get some code to execute before the ScreenGameplay constructor +ScreenDemonstration::ScreenDemonstration( CString sName ) : ScreenJukebox( sName, PrepareForDemonstration() ) // this is a hack to get some code to execute before the ScreenGameplay constructor { LOG->Trace( "ScreenDemonstration::ScreenDemonstration()" ); diff --git a/stepmania/src/ScreenDemonstration.h b/stepmania/src/ScreenDemonstration.h index 227544ba53..d13cff1d11 100644 --- a/stepmania/src/ScreenDemonstration.h +++ b/stepmania/src/ScreenDemonstration.h @@ -15,7 +15,7 @@ class ScreenDemonstration : public ScreenJukebox { public: - ScreenDemonstration(); + ScreenDemonstration( CString sName ); ~ScreenDemonstration(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index f589dd005e..d3137a585b 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -212,7 +212,7 @@ Menu g_BGChange ); -ScreenEdit::ScreenEdit() : Screen("ScreenEdit") +ScreenEdit::ScreenEdit( CString sName ) : Screen( sName ) { LOG->Trace( "ScreenEdit::ScreenEdit()" ); diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h index acab622f1f..51af053f60 100644 --- a/stepmania/src/ScreenEdit.h +++ b/stepmania/src/ScreenEdit.h @@ -27,7 +27,7 @@ const int NUM_NAMING_MENU_ITEMS = 6; class ScreenEdit : public Screen { public: - ScreenEdit(); + ScreenEdit( CString sName ); virtual ~ScreenEdit(); virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenEditCoursesMenu.cpp b/stepmania/src/ScreenEditCoursesMenu.cpp index de6e5886a8..9b592d4252 100644 --- a/stepmania/src/ScreenEditCoursesMenu.cpp +++ b/stepmania/src/ScreenEditCoursesMenu.cpp @@ -34,7 +34,7 @@ const ScreenMessage SM_RefreshSelector = (ScreenMessage)(SM_User+1); -ScreenEditCoursesMenu::ScreenEditCoursesMenu() : Screen("ScreenEditCoursesMenu") +ScreenEditCoursesMenu::ScreenEditCoursesMenu( CString sName ) : Screen( sName ) { LOG->Trace( "ScreenEditCoursesMenu::ScreenEditCoursesMenu()" ); diff --git a/stepmania/src/ScreenEditCoursesMenu.h b/stepmania/src/ScreenEditCoursesMenu.h index 21ebaf7fa4..7d5e7da0e7 100644 --- a/stepmania/src/ScreenEditCoursesMenu.h +++ b/stepmania/src/ScreenEditCoursesMenu.h @@ -18,7 +18,7 @@ class ScreenEditCoursesMenu : public Screen { public: - ScreenEditCoursesMenu(); + ScreenEditCoursesMenu( CString sName ); virtual ~ScreenEditCoursesMenu(); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 4222afc846..5fc09c6b4b 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -34,7 +34,7 @@ const ScreenMessage SM_RefreshSelector = (ScreenMessage)(SM_User+1); -ScreenEditMenu::ScreenEditMenu() : Screen("ScreenEditMenu") +ScreenEditMenu::ScreenEditMenu( CString sName ) : Screen( sName ) { LOG->Trace( "ScreenEditMenu::ScreenEditMenu()" ); diff --git a/stepmania/src/ScreenEditMenu.h b/stepmania/src/ScreenEditMenu.h index 8bec31ca70..d59f70460b 100644 --- a/stepmania/src/ScreenEditMenu.h +++ b/stepmania/src/ScreenEditMenu.h @@ -18,7 +18,7 @@ class ScreenEditMenu : public Screen { public: - ScreenEditMenu(); + ScreenEditMenu( CString sName ); virtual ~ScreenEditMenu(); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index 97778701a8..32adcbca4d 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -106,43 +106,43 @@ protected: class ScreenEvaluationStage : public ScreenEvaluation { public: - ScreenEvaluationStage() : ScreenEvaluation("ScreenEvaluationStage",ScreenEvaluation::stage) {}; + ScreenEvaluationStage( CString sClassName ) : ScreenEvaluation(sClassName,ScreenEvaluation::stage) {}; }; class ScreenEvaluationSummary : public ScreenEvaluation { public: - ScreenEvaluationSummary() : ScreenEvaluation("ScreenEvaluationSummary",ScreenEvaluation::summary) {}; + ScreenEvaluationSummary( CString sClassName ) : ScreenEvaluation(sClassName,ScreenEvaluation::summary) {}; }; class ScreenEvaluationNonstop : public ScreenEvaluation { public: - ScreenEvaluationNonstop() : ScreenEvaluation("ScreenEvaluationNonstop",ScreenEvaluation::course) {}; + ScreenEvaluationNonstop( CString sClassName ) : ScreenEvaluation(sClassName,ScreenEvaluation::course) {}; }; class ScreenEvaluationOni : public ScreenEvaluation { public: - ScreenEvaluationOni() : ScreenEvaluation("ScreenEvaluationOni",ScreenEvaluation::course) {}; + ScreenEvaluationOni( CString sClassName ) : ScreenEvaluation(sClassName, ScreenEvaluation::course) {}; }; class ScreenEvaluationEndless : public ScreenEvaluation { public: - ScreenEvaluationEndless() : ScreenEvaluation("ScreenEvaluationEndless",ScreenEvaluation::course) {}; + ScreenEvaluationEndless( CString sClassName ) : ScreenEvaluation(sClassName, ScreenEvaluation::course) {}; }; class ScreenEvaluationBattle : public ScreenEvaluation { public: - ScreenEvaluationBattle() : ScreenEvaluation("ScreenEvaluationBattle",ScreenEvaluation::stage) {}; + ScreenEvaluationBattle( CString sClassName ) : ScreenEvaluation(sClassName, ScreenEvaluation::stage) {}; }; class ScreenEvaluationRave : public ScreenEvaluation { public: - ScreenEvaluationRave() : ScreenEvaluation("ScreenEvaluationRave",ScreenEvaluation::stage) {}; + ScreenEvaluationRave( CString sClassName ) : ScreenEvaluation(sClassName,ScreenEvaluation::stage) {}; }; diff --git a/stepmania/src/ScreenExit.cpp b/stepmania/src/ScreenExit.cpp index ac95e61e20..63e76b3b56 100644 --- a/stepmania/src/ScreenExit.cpp +++ b/stepmania/src/ScreenExit.cpp @@ -8,7 +8,7 @@ #include "RageLog.h" #include "StepMania.h" -ScreenExit::ScreenExit(): Screen("ScreenExit") +ScreenExit::ScreenExit( CString sName ): Screen( sName ) { m_Exited = false; diff --git a/stepmania/src/ScreenExit.h b/stepmania/src/ScreenExit.h index 2f6e44c78b..b5f3c91108 100644 --- a/stepmania/src/ScreenExit.h +++ b/stepmania/src/ScreenExit.h @@ -10,7 +10,7 @@ class ScreenExit: public Screen RageTimer m_ShutdownTimer; public: - ScreenExit(); + ScreenExit( CString sName ); void Update( float fDelta ); }; diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 0ef10bdf1f..281f747b8c 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -72,7 +72,7 @@ const float TWEEN_TIME = 0.5f; const ScreenMessage SM_NoSongs = ScreenMessage(SM_User+3); -ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic") +ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : Screen( sName ) { i_SkipAheadOffset = 0; LastInputTime = 0; diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h index 278df32323..7a60c9a282 100644 --- a/stepmania/src/ScreenEz2SelectMusic.h +++ b/stepmania/src/ScreenEz2SelectMusic.h @@ -25,7 +25,7 @@ class ScreenEz2SelectMusic : public Screen { public: - ScreenEz2SelectMusic(); + ScreenEz2SelectMusic( CString sName ); virtual void DrawPrimitives(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 96da6bec73..f9d1759ce1 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -45,7 +45,7 @@ ScreenEz2SelectPlayer (Constructor) Desc: Sets up the screen display ************************************/ -ScreenEz2SelectPlayer::ScreenEz2SelectPlayer() : Screen("ScreenEz2SelectPlayer") +ScreenEz2SelectPlayer::ScreenEz2SelectPlayer( CString sName ) : Screen( sName ) { // Unjoin the players, then let them join back in on this screen GAMESTATE->m_bPlayersCanJoin = true; diff --git a/stepmania/src/ScreenEz2SelectPlayer.h b/stepmania/src/ScreenEz2SelectPlayer.h index 29d581fe55..9fcfa28daf 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.h +++ b/stepmania/src/ScreenEz2SelectPlayer.h @@ -16,7 +16,7 @@ Andrew Livy class ScreenEz2SelectPlayer : public Screen { public: - ScreenEz2SelectPlayer(); // Constructor + ScreenEz2SelectPlayer( CString sName ); virtual ~ScreenEz2SelectPlayer(); // Destructor /* Public Function Prototypes */ diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp index 2568a6b236..22d68d6fa3 100644 --- a/stepmania/src/ScreenGameOver.cpp +++ b/stepmania/src/ScreenGameOver.cpp @@ -25,7 +25,7 @@ const ScreenMessage SM_PlayAnnouncer = ScreenMessage(SM_User + 3); #define NEXT_SCREEN THEME->GetMetric("ScreenGameOver","NextScreen") -ScreenGameOver::ScreenGameOver() : Screen("ScreenGameOver") +ScreenGameOver::ScreenGameOver( CString sName ) : Screen( sName ) { GAMESTATE->Reset(); diff --git a/stepmania/src/ScreenGameOver.h b/stepmania/src/ScreenGameOver.h index 51e6ee42c2..c046497a95 100644 --- a/stepmania/src/ScreenGameOver.h +++ b/stepmania/src/ScreenGameOver.h @@ -17,7 +17,7 @@ class ScreenGameOver : public Screen { public: - ScreenGameOver(); + ScreenGameOver( CString sName ); virtual void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 14dd98a4b4..27d8c796aa 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -79,7 +79,8 @@ const ScreenMessage SM_GoToScreenAfterFail = ScreenMessage(SM_User+31); const ScreenMessage SM_StartHereWeGo = ScreenMessage(SM_User+40); const ScreenMessage SM_StopHereWeGo = ScreenMessage(SM_User+41); -ScreenGameplay::ScreenGameplay( bool bDemonstration ) : Screen("ScreenGameplay") +/* XXX: Not using sName yet here until I work out jukebox/demo. */ +ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("ScreenGameplay") { LOG->Trace( "ScreenGameplay::ScreenGameplay()" ); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index b58c76b394..d61f0525ad 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -57,7 +57,7 @@ class LyricsLoader; class ScreenGameplay : public Screen { public: - ScreenGameplay( bool bDemonstration = false ); + ScreenGameplay( CString sName, bool bDemonstration = false ); virtual ~ScreenGameplay(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenGameplayOptions.cpp b/stepmania/src/ScreenGameplayOptions.cpp index 490ce434fc..a697259a42 100644 --- a/stepmania/src/ScreenGameplayOptions.cpp +++ b/stepmania/src/ScreenGameplayOptions.cpp @@ -42,8 +42,8 @@ OptionRow g_GameplayOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = { OptionRow( "Unlock\nSystem", true, "OFF","ON" ) }; -ScreenGameplayOptions::ScreenGameplayOptions() : - ScreenOptions("ScreenGameplayOptions") +ScreenGameplayOptions::ScreenGameplayOptions( CString sName ) : + ScreenOptions( sName ) { LOG->Trace( "ScreenGameplayOptions::ScreenGameplayOptions()" ); diff --git a/stepmania/src/ScreenGameplayOptions.h b/stepmania/src/ScreenGameplayOptions.h index 9e44e30253..b7d775786e 100644 --- a/stepmania/src/ScreenGameplayOptions.h +++ b/stepmania/src/ScreenGameplayOptions.h @@ -14,7 +14,7 @@ class ScreenGameplayOptions : public ScreenOptions { public: - ScreenGameplayOptions(); + ScreenGameplayOptions( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp index 69f5e70135..f467306ba9 100644 --- a/stepmania/src/ScreenGraphicOptions.cpp +++ b/stepmania/src/ScreenGraphicOptions.cpp @@ -58,8 +58,8 @@ static const int TextureRes[] = { 256, 512, 1024, 2048 }; -ScreenGraphicOptions::ScreenGraphicOptions() : - ScreenOptions("ScreenGraphicOptions") +ScreenGraphicOptions::ScreenGraphicOptions( CString sName ) : + ScreenOptions( sName ) { LOG->Trace( "ScreenGraphicOptions::ScreenGraphicOptions()" ); diff --git a/stepmania/src/ScreenGraphicOptions.h b/stepmania/src/ScreenGraphicOptions.h index c013340476..15a62f7db4 100644 --- a/stepmania/src/ScreenGraphicOptions.h +++ b/stepmania/src/ScreenGraphicOptions.h @@ -16,7 +16,7 @@ class ScreenGraphicOptions : public ScreenOptions { public: - ScreenGraphicOptions(); + ScreenGraphicOptions( CString sClassName ); private: void UpdateRefreshRates(); diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index d315a0cd29..523573aa5b 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -76,7 +76,7 @@ static bool HaveAllCharAnimations() return true; } -ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay") +ScreenHowToPlay::ScreenHowToPlay( CString sName ) : ScreenAttract( sName ) { m_iPerfects = 0; m_iNumPerfects = NUM_PERFECTS; diff --git a/stepmania/src/ScreenHowToPlay.h b/stepmania/src/ScreenHowToPlay.h index 68900c8c75..be866a4885 100644 --- a/stepmania/src/ScreenHowToPlay.h +++ b/stepmania/src/ScreenHowToPlay.h @@ -19,7 +19,7 @@ class ScreenHowToPlay : public ScreenAttract { public: - ScreenHowToPlay(); + ScreenHowToPlay( CString sName ); ~ScreenHowToPlay(); virtual void Update( float fDelta ); diff --git a/stepmania/src/ScreenInputOptions.cpp b/stepmania/src/ScreenInputOptions.cpp index 3d363072e8..6c2ac455ab 100644 --- a/stepmania/src/ScreenInputOptions.cpp +++ b/stepmania/src/ScreenInputOptions.cpp @@ -43,8 +43,8 @@ OptionRow g_InputOptionsLines[NUM_INPUT_OPTIONS_LINES] = { OptionRow( "Wheel\nSpeed", true, "SLOW","NORMAL","FAST","REALLY FAST" ), }; -ScreenInputOptions::ScreenInputOptions() : - ScreenOptions("ScreenInputOptions") +ScreenInputOptions::ScreenInputOptions( CString sName ) : + ScreenOptions( sName ) { LOG->Trace( "ScreenInputOptions::ScreenInputOptions()" ); diff --git a/stepmania/src/ScreenInputOptions.h b/stepmania/src/ScreenInputOptions.h index 4d75f4896f..db5cbd1fbb 100644 --- a/stepmania/src/ScreenInputOptions.h +++ b/stepmania/src/ScreenInputOptions.h @@ -14,7 +14,7 @@ class ScreenInputOptions : public ScreenOptions { public: - ScreenInputOptions(); + ScreenInputOptions( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp index 5c49072b4a..4222021487 100644 --- a/stepmania/src/ScreenInstructions.cpp +++ b/stepmania/src/ScreenInstructions.cpp @@ -26,7 +26,7 @@ #define NEXT_SCREEN( pm ) THEME->GetMetric("ScreenInstructions","NextScreen"+Capitalize(PlayModeToString(pm)) ) -ScreenInstructions::ScreenInstructions() : Screen("ScreenInstructions") +ScreenInstructions::ScreenInstructions( CString sName ) : Screen( sName ) { LOG->Trace( "ScreenInstructions::ScreenInstructions()" ); diff --git a/stepmania/src/ScreenInstructions.h b/stepmania/src/ScreenInstructions.h index 7dbd389ad4..d4eab55549 100644 --- a/stepmania/src/ScreenInstructions.h +++ b/stepmania/src/ScreenInstructions.h @@ -21,7 +21,7 @@ class ScreenInstructions : public Screen { public: - ScreenInstructions(); + ScreenInstructions( CString sName ); virtual ~ScreenInstructions(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenIntroMovie.h b/stepmania/src/ScreenIntroMovie.h index 09307978ba..a2239feba5 100644 --- a/stepmania/src/ScreenIntroMovie.h +++ b/stepmania/src/ScreenIntroMovie.h @@ -16,7 +16,7 @@ class ScreenIntroMovie : public ScreenAttract { public: - ScreenIntroMovie() : ScreenAttract("ScreenIntroMovie") { }; + ScreenIntroMovie( CString sName ) : ScreenAttract( sName ) { }; void Update( float fDelta ); }; diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 8a5c69552d..99d139399c 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -132,7 +132,7 @@ bool ScreenJukebox::PrepareForJukebox() // always return true. return true; } -ScreenJukebox::ScreenJukebox( bool bDemonstration ) : ScreenGameplay( PrepareForJukebox() ) // this is a hack to get some code to execute before the ScreenGameplay constructor +ScreenJukebox::ScreenJukebox( CString sName, bool bDemonstration ) : ScreenGameplay( "ScreenGameplay", PrepareForJukebox() ) // this is a hack to get some code to execute before the ScreenGameplay constructor { LOG->Trace( "ScreenJukebox::ScreenJukebox()" ); diff --git a/stepmania/src/ScreenJukebox.h b/stepmania/src/ScreenJukebox.h index cb4a65c75b..14241dbe6f 100644 --- a/stepmania/src/ScreenJukebox.h +++ b/stepmania/src/ScreenJukebox.h @@ -18,7 +18,7 @@ class ScreenJukebox : public ScreenGameplay { public: - ScreenJukebox( bool bDemonstration = false ); + ScreenJukebox( CString sName, bool bDemonstration = false ); ~ScreenJukebox(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenJukeboxMenu.cpp b/stepmania/src/ScreenJukeboxMenu.cpp index d050b03902..15650d1829 100644 --- a/stepmania/src/ScreenJukeboxMenu.cpp +++ b/stepmania/src/ScreenJukeboxMenu.cpp @@ -33,7 +33,7 @@ #define HELP_TEXT THEME->GetMetric("ScreenJukeboxMenu","HelpText") -ScreenJukeboxMenu::ScreenJukeboxMenu() : Screen("ScreenJukeboxMenu") +ScreenJukeboxMenu::ScreenJukeboxMenu( CString sClassName ) : Screen( sClassName ) { LOG->Trace( "ScreenJukeboxMenu::ScreenJukeboxMenu()" ); diff --git a/stepmania/src/ScreenJukeboxMenu.h b/stepmania/src/ScreenJukeboxMenu.h index 5ad19b97f3..6c3228ce9e 100644 --- a/stepmania/src/ScreenJukeboxMenu.h +++ b/stepmania/src/ScreenJukeboxMenu.h @@ -19,7 +19,7 @@ class ScreenJukeboxMenu : public Screen { public: - ScreenJukeboxMenu(); + ScreenJukeboxMenu( CString sName ); virtual ~ScreenJukeboxMenu(); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenLogo.cpp b/stepmania/src/ScreenLogo.cpp index 999fec6968..fe0f2d3af5 100644 --- a/stepmania/src/ScreenLogo.cpp +++ b/stepmania/src/ScreenLogo.cpp @@ -20,7 +20,7 @@ #define LOGO_ON_COMMAND THEME->GetMetric("ScreenLogo","LogoOnCommand") -ScreenLogo::ScreenLogo() : ScreenAttract("ScreenLogo") +ScreenLogo::ScreenLogo( CString sName ) : ScreenAttract( sName ) { m_sprLogo.Load( THEME->GetPathToG(ssprintf("ScreenLogo %s",GAMESTATE->GetCurrentGameDef()->m_szName)) ); m_sprLogo.Command( LOGO_ON_COMMAND ); diff --git a/stepmania/src/ScreenLogo.h b/stepmania/src/ScreenLogo.h index 724cc6f0d9..679eb4735f 100644 --- a/stepmania/src/ScreenLogo.h +++ b/stepmania/src/ScreenLogo.h @@ -18,7 +18,7 @@ class ScreenLogo : public ScreenAttract { public: - ScreenLogo(); + ScreenLogo( CString sName ); protected: Sprite m_sprLogo; diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp index a6c5691c16..b417cb077c 100644 --- a/stepmania/src/ScreenMachineOptions.cpp +++ b/stepmania/src/ScreenMachineOptions.cpp @@ -57,8 +57,8 @@ OptionRow g_MachineOptionsLines[NUM_MACHINE_OPTIONS_LINES] = { OptionRow( "Song\nOptions", true, "HIDE","SHOW","ASK" ), }; -ScreenMachineOptions::ScreenMachineOptions() : - ScreenOptions("ScreenMachineOptions") +ScreenMachineOptions::ScreenMachineOptions( CString sClassName ) : + ScreenOptions( sClassName ) { LOG->Trace( "ScreenMachineOptions::ScreenMachineOptions()" ); diff --git a/stepmania/src/ScreenMachineOptions.h b/stepmania/src/ScreenMachineOptions.h index 95f2b7dc2a..f4cc2bb20c 100644 --- a/stepmania/src/ScreenMachineOptions.h +++ b/stepmania/src/ScreenMachineOptions.h @@ -16,7 +16,7 @@ class ScreenMachineOptions : public ScreenOptions { public: - ScreenMachineOptions(); + ScreenMachineOptions( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index cec9b6feaa..c2fd0f2938 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -557,7 +557,7 @@ void ScreenManager::Prompt( ScreenMessage SM_SendWhenDone, CString sText, bool b void ScreenManager::TextEntry( ScreenMessage SM_SendWhenDone, CString sQuestion, CString sInitialAnswer, void(*OnOK)(CString sAnswer), void(*OnCanel)() ) { // add the new state onto the back of the array - m_ScreenStack.push_back( new ScreenTextEntry(SM_SendWhenDone, sQuestion, sInitialAnswer, OnOK, OnCanel) ); + m_ScreenStack.push_back( new ScreenTextEntry("ScreenTextEntry", SM_SendWhenDone, sQuestion, sInitialAnswer, OnOK, OnCanel) ); } void ScreenManager::MiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel ) diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 44b762494d..92382d3aff 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -46,7 +46,7 @@ const float BUTTON_COLUMN_X[NUM_GAME_TO_DEVICE_SLOTS*MAX_GAME_CONTROLLERS] = }; -ScreenMapControllers::ScreenMapControllers() : Screen("ScreenMapControllers") +ScreenMapControllers::ScreenMapControllers( CString sClassName ) : Screen( sClassName ) { LOG->Trace( "ScreenMapControllers::ScreenMapControllers()" ); diff --git a/stepmania/src/ScreenMapControllers.h b/stepmania/src/ScreenMapControllers.h index 4bb125e1d6..8e49b20c36 100644 --- a/stepmania/src/ScreenMapControllers.h +++ b/stepmania/src/ScreenMapControllers.h @@ -22,7 +22,7 @@ class ScreenMapControllers : public Screen { public: - ScreenMapControllers(); + ScreenMapControllers( CString sName ); virtual ~ScreenMapControllers(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenMemoryCard.h b/stepmania/src/ScreenMemoryCard.h index eb9fc1862d..310c7f8905 100644 --- a/stepmania/src/ScreenMemoryCard.h +++ b/stepmania/src/ScreenMemoryCard.h @@ -15,7 +15,7 @@ class ScreenMemoryCard : public ScreenAttract { public: - ScreenMemoryCard() : ScreenAttract("ScreenMemoryCard") { }; + ScreenMemoryCard( CString sName ) : ScreenAttract( sName ) { }; }; diff --git a/stepmania/src/ScreenMiniMenu.h b/stepmania/src/ScreenMiniMenu.h index 8e334d920c..8cce14ea04 100644 --- a/stepmania/src/ScreenMiniMenu.h +++ b/stepmania/src/ScreenMiniMenu.h @@ -66,7 +66,7 @@ struct Menu class ScreenMiniMenu : public Screen { public: - ScreenMiniMenu(); + ScreenMiniMenu( CString sName ); ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel ); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp index aa04af9fa7..da6c91dede 100644 --- a/stepmania/src/ScreenMusicScroll.cpp +++ b/stepmania/src/ScreenMusicScroll.cpp @@ -37,7 +37,7 @@ const CString CREDIT_LINES[] = const unsigned NUM_CREDIT_LINES = sizeof(CREDIT_LINES) / sizeof(CString); -ScreenMusicScroll::ScreenMusicScroll() : Screen("ScreenMusicScroll") +ScreenMusicScroll::ScreenMusicScroll( CString sClassName ) : Screen( sClassName ) { LOG->Trace( "ScreenMusicScroll::ScreenMusicScroll()" ); diff --git a/stepmania/src/ScreenMusicScroll.h b/stepmania/src/ScreenMusicScroll.h index ae1a94e434..5fc2442f87 100644 --- a/stepmania/src/ScreenMusicScroll.h +++ b/stepmania/src/ScreenMusicScroll.h @@ -23,7 +23,7 @@ class ScreenMusicScroll : public Screen { public: - ScreenMusicScroll(); + ScreenMusicScroll( CString sName ); virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index aa08dd871b..9ba72cf27d 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -88,7 +88,7 @@ float GetClosestCharYPos( float fFakeBeat ) } -ScreenNameEntry::ScreenNameEntry() : Screen("ScreenNameEntry") +ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) { LOG->Trace( "ScreenNameEntry::ScreenNameEntry()" ); diff --git a/stepmania/src/ScreenNameEntry.h b/stepmania/src/ScreenNameEntry.h index 77e5fec384..75ee116029 100644 --- a/stepmania/src/ScreenNameEntry.h +++ b/stepmania/src/ScreenNameEntry.h @@ -21,7 +21,7 @@ class ScreenNameEntry : public Screen { public: - ScreenNameEntry(); + ScreenNameEntry( CString sName ); virtual ~ScreenNameEntry(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenOptionsMenu.cpp b/stepmania/src/ScreenOptionsMenu.cpp index 10980591dd..fcdf267ad9 100644 --- a/stepmania/src/ScreenOptionsMenu.cpp +++ b/stepmania/src/ScreenOptionsMenu.cpp @@ -56,8 +56,8 @@ OptionRow g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = { OptionRow( "", true, "Reload Songs/Courses" ), }; -ScreenOptionsMenu::ScreenOptionsMenu() : - ScreenOptions("ScreenOptionsMenu") +ScreenOptionsMenu::ScreenOptionsMenu( CString sClassName ) : + ScreenOptions( sClassName ) { LOG->Trace( "ScreenOptionsMenu::ScreenOptionsMenu()" ); diff --git a/stepmania/src/ScreenOptionsMenu.h b/stepmania/src/ScreenOptionsMenu.h index 0f4284b9ae..9e9b1a3c8f 100644 --- a/stepmania/src/ScreenOptionsMenu.h +++ b/stepmania/src/ScreenOptionsMenu.h @@ -16,7 +16,7 @@ class ScreenOptionsMenu : public ScreenOptions { public: - ScreenOptionsMenu(); + ScreenOptionsMenu( CString sName ); protected: void MenuStart( PlayerNumber pn ); diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index af44e5dfcf..4a5b4214cf 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -78,8 +78,8 @@ static const PlayerOptions::Effect ChoosableEffects[] = PlayerOptions::NUM_EFFECTS }; -ScreenPlayerOptions::ScreenPlayerOptions() : - ScreenOptions("ScreenPlayerOptions") +ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) : + ScreenOptions( sClassName ) { LOG->Trace( "ScreenPlayerOptions::ScreenPlayerOptions()" ); diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h index d66dc9bb5f..47586436c2 100644 --- a/stepmania/src/ScreenPlayerOptions.h +++ b/stepmania/src/ScreenPlayerOptions.h @@ -18,7 +18,7 @@ class ScreenPlayerOptions : public ScreenOptions { public: - ScreenPlayerOptions(); + ScreenPlayerOptions( CString sName ); virtual void Update( float fDelta ); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index 854cc73bae..4fffcf2067 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -37,8 +37,7 @@ OptionRow g_ProfileOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = { OptionRow( "Rename", true ), }; -ScreenProfileOptions::ScreenProfileOptions() : - ScreenOptions("ScreenProfileOptions") +ScreenProfileOptions::ScreenProfileOptions( CString sClassName ) : ScreenOptions( sClassName ) { LOG->Trace( "ScreenProfileOptions::ScreenProfileOptions()" ); diff --git a/stepmania/src/ScreenProfileOptions.h b/stepmania/src/ScreenProfileOptions.h index 2986725db3..9ab88c9b66 100644 --- a/stepmania/src/ScreenProfileOptions.h +++ b/stepmania/src/ScreenProfileOptions.h @@ -14,7 +14,7 @@ class ScreenProfileOptions : public ScreenOptions { public: - ScreenProfileOptions(); + ScreenProfileOptions( CString sName ); virtual void MenuStart( PlayerNumber pn ); diff --git a/stepmania/src/ScreenPrompt.h b/stepmania/src/ScreenPrompt.h index ae21e1065c..e54e9ca0a6 100644 --- a/stepmania/src/ScreenPrompt.h +++ b/stepmania/src/ScreenPrompt.h @@ -20,7 +20,7 @@ class ScreenPrompt : public Screen { public: - ScreenPrompt(); + ScreenPrompt( CString sName ); ScreenPrompt( ScreenMessage SM_SendWhenDone, CString sText, bool bYesNoPrompt=false, bool bDefaultAnswer = false, void(*OnYes)(void*) = NULL, void(*OnNo)(void*) = NULL, void* pCallbackData = NULL ); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index 1d65b2c2a9..52e718ac32 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -47,7 +47,7 @@ const ScreenMessage SM_ShowNextPage = (ScreenMessage)(SM_User+67); const ScreenMessage SM_HidePage = (ScreenMessage)(SM_User+68); -ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking") +ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ) { m_sprCategory.SetXY( CATEGORY_X, CATEGORY_Y ); this->AddChild( &m_sprCategory ); diff --git a/stepmania/src/ScreenRanking.h b/stepmania/src/ScreenRanking.h index f2b4205c66..96d3bcddee 100644 --- a/stepmania/src/ScreenRanking.h +++ b/stepmania/src/ScreenRanking.h @@ -20,7 +20,7 @@ class Course; class ScreenRanking : public ScreenAttract { public: - ScreenRanking(); + ScreenRanking( CString sName ); void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenRaveOptions.cpp b/stepmania/src/ScreenRaveOptions.cpp index ddcedb5ea4..21cb84a568 100644 --- a/stepmania/src/ScreenRaveOptions.cpp +++ b/stepmania/src/ScreenRaveOptions.cpp @@ -40,8 +40,7 @@ OptionRow g_RaveOptionsLines[NUM_RAVE_OPTIONS_LINES] = { PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 }; -ScreenRaveOptions::ScreenRaveOptions() : - ScreenOptions("ScreenRaveOptions") +ScreenRaveOptions::ScreenRaveOptions( CString sClassName ): ScreenOptions( sClassName ) { LOG->Trace( "ScreenRaveOptions::ScreenRaveOptions()" ); diff --git a/stepmania/src/ScreenRaveOptions.h b/stepmania/src/ScreenRaveOptions.h index 17c877c2ad..2e7cef23cd 100644 --- a/stepmania/src/ScreenRaveOptions.h +++ b/stepmania/src/ScreenRaveOptions.h @@ -14,7 +14,7 @@ class ScreenRaveOptions : public ScreenOptions { public: - ScreenRaveOptions(); + ScreenRaveOptions( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp index 6d7435331d..973c71732c 100644 --- a/stepmania/src/ScreenSandbox.cpp +++ b/stepmania/src/ScreenSandbox.cpp @@ -22,7 +22,7 @@ #include "RageLog.h" -ScreenSandbox::ScreenSandbox() : Screen("ScreenSandbox") +ScreenSandbox::ScreenSandbox( CString sClassName ) : Screen( sClassName ) { // m_quad1.StretchTo( RectI(SCREEN_LEFT, SCREEN_TOP, SCREEN_RIGHT, SCREEN_BOTTOM) ); // m_quad1.SetDiffuse( RageColor(0,0,1,1) ); diff --git a/stepmania/src/ScreenSandbox.h b/stepmania/src/ScreenSandbox.h index d8f62e029c..02c5f29a4c 100644 --- a/stepmania/src/ScreenSandbox.h +++ b/stepmania/src/ScreenSandbox.h @@ -19,7 +19,7 @@ class ScreenSandbox : public Screen { public: - ScreenSandbox(); + ScreenSandbox( CString sName ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index 3a50b01081..c41fb579bf 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -59,7 +59,7 @@ const PlayerNumber CPU_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 }; -ScreenSelectCharacter::ScreenSelectCharacter() : Screen("ScreenSelectCharacter") +ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : Screen( sClassName ) { LOG->Trace( "ScreenSelectCharacter::ScreenSelectCharacter()" ); diff --git a/stepmania/src/ScreenSelectCharacter.h b/stepmania/src/ScreenSelectCharacter.h index 5b9a3b1960..eca0a7164b 100644 --- a/stepmania/src/ScreenSelectCharacter.h +++ b/stepmania/src/ScreenSelectCharacter.h @@ -22,7 +22,7 @@ class ScreenSelectCharacter : public Screen { public: - ScreenSelectCharacter(); + ScreenSelectCharacter( CString sName ); virtual ~ScreenSelectCharacter(); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp index eca6c7dfb3..783fe927aa 100644 --- a/stepmania/src/ScreenSelectCourse.cpp +++ b/stepmania/src/ScreenSelectCourse.cpp @@ -57,7 +57,7 @@ static const ScreenMessage SM_AllowOptionsMenuRepeat = ScreenMessage(SM_User+1); -ScreenSelectCourse::ScreenSelectCourse() : Screen("ScreenSelectCourse") +ScreenSelectCourse::ScreenSelectCourse( CString sClassName ) : Screen( sClassName ) { LOG->Trace( "ScreenSelectCourse::ScreenSelectCourse()" ); diff --git a/stepmania/src/ScreenSelectCourse.h b/stepmania/src/ScreenSelectCourse.h index e7a3b6d6c5..a8c4101421 100644 --- a/stepmania/src/ScreenSelectCourse.h +++ b/stepmania/src/ScreenSelectCourse.h @@ -23,7 +23,7 @@ class ScreenSelectCourse : public Screen { public: - ScreenSelectCourse(); + ScreenSelectCourse( CString sName ); virtual ~ScreenSelectCourse(); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 4a4b97d6d7..a324c6bfb6 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -35,7 +35,7 @@ #define DISABLED_COLOR THEME->GetMetricC("ScreenSelectDifficulty","DisabledColor") -ScreenSelectDifficulty::ScreenSelectDifficulty() : ScreenSelect( "ScreenSelectDifficulty" ) +ScreenSelectDifficulty::ScreenSelectDifficulty( CString sClassName ) : ScreenSelect( sClassName ) { m_CurrentPage = PAGE_1; int p; diff --git a/stepmania/src/ScreenSelectDifficulty.h b/stepmania/src/ScreenSelectDifficulty.h index 940f71aea4..7f67dc25b6 100644 --- a/stepmania/src/ScreenSelectDifficulty.h +++ b/stepmania/src/ScreenSelectDifficulty.h @@ -23,7 +23,7 @@ class ScreenSelectDifficulty : public ScreenSelect { public: - ScreenSelectDifficulty(); + ScreenSelectDifficulty( CString sName ); virtual void Update( float fDelta ); diff --git a/stepmania/src/ScreenSelectDifficultyEX.cpp b/stepmania/src/ScreenSelectDifficultyEX.cpp index ee70320585..2e33e97003 100644 --- a/stepmania/src/ScreenSelectDifficultyEX.cpp +++ b/stepmania/src/ScreenSelectDifficultyEX.cpp @@ -53,7 +53,7 @@ #define SLEEP_AFTER_TWEEN_OFF_SECONDS THEME->GetMetricF("ScreenSelectDifficultyEX","SleepAfterTweenOffSeconds") -ScreenSelectDifficultyEX::ScreenSelectDifficultyEX() : ScreenSelect( "ScreenSelectDifficultyEX" ) +ScreenSelectDifficultyEX::ScreenSelectDifficultyEX( CString sClassName ) : ScreenSelect( sClassName ) { m_CurrentPage = PAGE_1; int p; diff --git a/stepmania/src/ScreenSelectDifficultyEX.h b/stepmania/src/ScreenSelectDifficultyEX.h index 7b4ca2b68a..808a3b5fc4 100644 --- a/stepmania/src/ScreenSelectDifficultyEX.h +++ b/stepmania/src/ScreenSelectDifficultyEX.h @@ -23,7 +23,7 @@ class ScreenSelectDifficultyEX : public ScreenSelect { public: - ScreenSelectDifficultyEX(); + ScreenSelectDifficultyEX( CString sName ); virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void MenuLeft( PlayerNumber pn ); diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp index 91ba024a04..d8cb1b6cf0 100644 --- a/stepmania/src/ScreenSelectGame.cpp +++ b/stepmania/src/ScreenSelectGame.cpp @@ -33,8 +33,8 @@ OptionRow g_SelectGameLines[NUM_SELECT_GAME_LINES] = }; -ScreenSelectGame::ScreenSelectGame() : - ScreenOptions("ScreenSelectGame") +ScreenSelectGame::ScreenSelectGame( CString sClassName ) : + ScreenOptions( sClassName ) { LOG->Trace( "ScreenSelectGame::ScreenSelectGame()" ); diff --git a/stepmania/src/ScreenSelectGame.h b/stepmania/src/ScreenSelectGame.h index 90d745301c..9d3b25f9fc 100644 --- a/stepmania/src/ScreenSelectGame.h +++ b/stepmania/src/ScreenSelectGame.h @@ -14,7 +14,7 @@ class ScreenSelectGame : public ScreenOptions { public: - ScreenSelectGame(); + ScreenSelectGame( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 608774a254..2cf23c8f36 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -33,7 +33,7 @@ #define NEXT_SCREEN THEME->GetMetric ("ScreenSelectGroup","NextScreen") -ScreenSelectGroup::ScreenSelectGroup() : Screen("ScreenSelectGroup") +ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : Screen( sClassName ) { LOG->Trace( "ScreenSelectGroup::ScreenSelectGroup()" ); diff --git a/stepmania/src/ScreenSelectGroup.h b/stepmania/src/ScreenSelectGroup.h index 25cfc6c4c1..c8533fed08 100644 --- a/stepmania/src/ScreenSelectGroup.h +++ b/stepmania/src/ScreenSelectGroup.h @@ -21,7 +21,7 @@ class ScreenSelectGroup : public Screen { public: - ScreenSelectGroup(); + ScreenSelectGroup( CString sName ); virtual ~ScreenSelectGroup(); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index 29a3ccb9ef..8370d71e34 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -34,7 +34,7 @@ const ScreenMessage SM_PlayPostSwitchPage = (ScreenMessage)(SM_User+1); -ScreenSelectMaster::ScreenSelectMaster() : ScreenSelect( "ScreenSelectMaster" ) +ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName ) { int p, i; diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h index df2a3527e8..92e3e098a4 100644 --- a/stepmania/src/ScreenSelectMaster.h +++ b/stepmania/src/ScreenSelectMaster.h @@ -21,7 +21,7 @@ class ScreenSelectMaster : public ScreenSelect { public: - ScreenSelectMaster(); + ScreenSelectMaster( CString sName ); virtual void Update( float fDelta ); @@ -74,6 +74,8 @@ protected: // class ScreenSelectStyle5th : public ScreenSelectMaster { +public: + ScreenSelectStyle5th( CString sName ): ScreenSelectMaster( sName ) { } }; diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index c5c5521bb5..cd7ee9c8d8 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -39,7 +39,7 @@ ScreenSelectMode (Constructor) Desc: Sets up the screen display ************************************/ -ScreenSelectMode::ScreenSelectMode() : ScreenSelect( "ScreenSelectMode" ) +ScreenSelectMode::ScreenSelectMode( CString sClassName ) : ScreenSelect( sClassName ) { m_bSelected = false; m_ChoiceListFrame.Load( THEME->GetPathToG("ScreenSelectMode list frame")); diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h index 8ff3807603..c01231c38b 100644 --- a/stepmania/src/ScreenSelectMode.h +++ b/stepmania/src/ScreenSelectMode.h @@ -26,7 +26,7 @@ Andrew Livy class ScreenSelectMode : public ScreenSelect { public: - ScreenSelectMode(); // Constructor + ScreenSelectMode( CString sName ); // Constructor virtual ~ScreenSelectMode(); // Destructor virtual void MenuLeft( PlayerNumber pn ); virtual void MenuRight( PlayerNumber pn ); diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 0040fe7186..7ecdff54d6 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -73,7 +73,7 @@ static void FlipSpriteHorizontally(Sprite &s) s.SetCustomTextureCoords(Coords); } -ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic") +ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName ) { LOG->Trace( "ScreenSelectMusic::ScreenSelectMusic()" ); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index ed00d2d7c4..56d3829634 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -30,7 +30,7 @@ class ScreenSelectMusic : public Screen { public: - ScreenSelectMusic(); + ScreenSelectMusic( CString sName ); virtual ~ScreenSelectMusic(); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index 70bdc9ad7a..7657e1557c 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -26,7 +26,7 @@ #define DISABLED_COLOR THEME->GetMetricC("ScreenSelectStyle","DisabledColor") -ScreenSelectStyle::ScreenSelectStyle() : ScreenSelect( "ScreenSelectStyle" ) +ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClassName ) { m_iSelection = 0; diff --git a/stepmania/src/ScreenSelectStyle.h b/stepmania/src/ScreenSelectStyle.h index d56b067d53..bd82b2b816 100644 --- a/stepmania/src/ScreenSelectStyle.h +++ b/stepmania/src/ScreenSelectStyle.h @@ -22,7 +22,7 @@ class ScreenSelectStyle : public ScreenSelect { public: - ScreenSelectStyle(); + ScreenSelectStyle( CString sName ); virtual void MenuLeft( PlayerNumber pn ); virtual void MenuRight( PlayerNumber pn ); diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index 573915240b..97b25a2993 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -52,8 +52,8 @@ CString ScreenSongOptions::GetNextScreen() } -ScreenSongOptions::ScreenSongOptions() : - ScreenOptions("ScreenSongOptions") +ScreenSongOptions::ScreenSongOptions( CString sClassName ) : + ScreenOptions( sClassName ) { LOG->Trace( "ScreenSongOptions::ScreenSongOptions()" ); diff --git a/stepmania/src/ScreenSongOptions.h b/stepmania/src/ScreenSongOptions.h index 9c9d82f84b..e94388dd7d 100644 --- a/stepmania/src/ScreenSongOptions.h +++ b/stepmania/src/ScreenSongOptions.h @@ -15,7 +15,7 @@ class ScreenSongOptions : public ScreenOptions { public: - ScreenSongOptions(); + ScreenSongOptions( CString sName ); static CString GetNextScreen(); private: diff --git a/stepmania/src/ScreenSoundOptions.cpp b/stepmania/src/ScreenSoundOptions.cpp index 5bd3467267..ad71d4ea81 100644 --- a/stepmania/src/ScreenSoundOptions.cpp +++ b/stepmania/src/ScreenSoundOptions.cpp @@ -41,8 +41,8 @@ OptionRow g_SoundOptionsLines[NUM_SOUND_OPTIONS_LINES] = { OptionRow( "Resampling\nQuality", true, "FAST","NORMAL","HIGH QUALITY" ), }; -ScreenSoundOptions::ScreenSoundOptions() : - ScreenOptions("ScreenSoundOptions") +ScreenSoundOptions::ScreenSoundOptions( CString sClassName ) : + ScreenOptions( sClassName ) { LOG->Trace( "ScreenSoundOptions::ScreenSoundOptions()" ); diff --git a/stepmania/src/ScreenSoundOptions.h b/stepmania/src/ScreenSoundOptions.h index 37e7909316..a3d343b5b8 100644 --- a/stepmania/src/ScreenSoundOptions.h +++ b/stepmania/src/ScreenSoundOptions.h @@ -17,7 +17,7 @@ class ScreenSoundOptions : public ScreenOptions { public: - ScreenSoundOptions(); + ScreenSoundOptions( CString sName ); private: void ImportOptions(); diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index 78c56ad764..3e1d0ac577 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -52,7 +52,7 @@ enum StageMode }; */ -ScreenStage::ScreenStage() : Screen("ScreenStage") +ScreenStage::ScreenStage( CString sClassName ) : Screen( sClassName ) { SOUND->StopMusic(); diff --git a/stepmania/src/ScreenStage.h b/stepmania/src/ScreenStage.h index a7f3001f65..e27398b5d4 100644 --- a/stepmania/src/ScreenStage.h +++ b/stepmania/src/ScreenStage.h @@ -15,7 +15,7 @@ class ScreenStage : public Screen { public: - ScreenStage(); + ScreenStage( CString sName ); virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp index 073b5ae6a5..1df781a73f 100644 --- a/stepmania/src/ScreenStyleSplash.cpp +++ b/stepmania/src/ScreenStyleSplash.cpp @@ -28,7 +28,7 @@ const ScreenMessage SM_DoneOpening = ScreenMessage(SM_User-7); const ScreenMessage SM_StartClosing = ScreenMessage(SM_User-8); -ScreenStyleSplash::ScreenStyleSplash() : Screen("ScreenStyleSplash") +ScreenStyleSplash::ScreenStyleSplash( CString sName ) : Screen( sName ) { SOUND->StopMusic(); diff --git a/stepmania/src/ScreenStyleSplash.h b/stepmania/src/ScreenStyleSplash.h index 859de6b054..04aaee6e0d 100644 --- a/stepmania/src/ScreenStyleSplash.h +++ b/stepmania/src/ScreenStyleSplash.h @@ -21,7 +21,7 @@ class ScreenStyleSplash : public Screen { public: - ScreenStyleSplash(); + ScreenStyleSplash( CString sName ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp index 34d0b7c011..7fb0e43441 100644 --- a/stepmania/src/ScreenTest.cpp +++ b/stepmania/src/ScreenTest.cpp @@ -32,14 +32,14 @@ void ScreenTest::SetScreen(int num) delete current; if(num > 2) num = 0; if(num == 0) - current=new ScreenSandbox; + current=new ScreenSandbox("ScreenSandbox"); else if(num == 1) - current=new ScreenTestSound; + current=new ScreenTestSound("ScreenTestSound"); else if(num == 2) - current=new ScreenTestFonts; + current=new ScreenTestFonts("ScreenTestFonts"); } -ScreenTest::ScreenTest() : Screen("ScreenTest") +ScreenTest::ScreenTest( CString sClassName ) : Screen( sClassName ) { current = NULL; cur_screen = -1; diff --git a/stepmania/src/ScreenTest.h b/stepmania/src/ScreenTest.h index 1c5c841f0d..9c57779fa2 100644 --- a/stepmania/src/ScreenTest.h +++ b/stepmania/src/ScreenTest.h @@ -17,7 +17,7 @@ class ScreenTest : public Screen { public: - ScreenTest(); + ScreenTest( CString sName ); ~ScreenTest(); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); diff --git a/stepmania/src/ScreenTestFonts.cpp b/stepmania/src/ScreenTestFonts.cpp index 22abdc9502..91d00ea8fc 100644 --- a/stepmania/src/ScreenTestFonts.cpp +++ b/stepmania/src/ScreenTestFonts.cpp @@ -25,7 +25,7 @@ void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM ) SetText(CustomText); } -ScreenTestFonts::ScreenTestFonts() : Screen("ScreenTestFonts") +ScreenTestFonts::ScreenTestFonts( CString sClassName ) : Screen( sClassName ) { Hline.SetXY(CENTER_X, CENTER_Y); Hline.SetZoomX(LineWidth); diff --git a/stepmania/src/ScreenTestFonts.h b/stepmania/src/ScreenTestFonts.h index 0fb71c6178..75f4d25d90 100644 --- a/stepmania/src/ScreenTestFonts.h +++ b/stepmania/src/ScreenTestFonts.h @@ -8,7 +8,7 @@ class ScreenTestFonts: public Screen { public: - ScreenTestFonts(); + ScreenTestFonts( CString sName ); void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); void Draw(); diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp index 1478ff5557..665022af1f 100644 --- a/stepmania/src/ScreenTestSound.cpp +++ b/stepmania/src/ScreenTestSound.cpp @@ -20,7 +20,7 @@ #include "RageSoundManager.h" #include "ThemeManager.h" -ScreenTestSound::ScreenTestSound() : Screen("ScreenTestSound") +ScreenTestSound::ScreenTestSound( CString sClassName ) : Screen( sClassName ) { int i; this->AddChild(&HEEEEEEEEELP); diff --git a/stepmania/src/ScreenTestSound.h b/stepmania/src/ScreenTestSound.h index 5a2a50f16d..8a5cf85ce1 100644 --- a/stepmania/src/ScreenTestSound.h +++ b/stepmania/src/ScreenTestSound.h @@ -20,7 +20,7 @@ const int nsounds = 5; class ScreenTestSound : public Screen { public: - ScreenTestSound(); + ScreenTestSound( CString sName ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index 47db9a1f32..a0e84009c6 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -35,8 +35,8 @@ const float ANSWER_HEIGHT = 30; * Handle UTF-8. Right now, we need to at least be able to backspace * a whole UTF-8 character. Better would be to operate in longchars. */ -ScreenTextEntry::ScreenTextEntry( ScreenMessage SM_SendWhenDone, CString sQuestion, CString sInitialAnswer, void(*OnOK)(CString sAnswer), void(*OnCancel)() ) : - Screen("ScreenTextEntry") +ScreenTextEntry::ScreenTextEntry( CString sClassName, ScreenMessage SM_SendWhenDone, CString sQuestion, CString sInitialAnswer, void(*OnOK)(CString sAnswer), void(*OnCancel)() ) : + Screen( sClassName ) { m_bIsTransparent = true; // draw screens below us diff --git a/stepmania/src/ScreenTextEntry.h b/stepmania/src/ScreenTextEntry.h index ac99901a88..b8d5d0d5bb 100644 --- a/stepmania/src/ScreenTextEntry.h +++ b/stepmania/src/ScreenTextEntry.h @@ -22,7 +22,7 @@ class ScreenTextEntry : public Screen { public: - ScreenTextEntry( ScreenMessage SM_SendWhenDone, CString sQuestion, CString sInitialAnswer, void(*OnOK)(CString sAnswer) = NULL, void(*OnCanel)() = NULL ); + ScreenTextEntry( CString sName, ScreenMessage SM_SendWhenDone, CString sQuestion, CString sInitialAnswer, void(*OnOK)(CString sAnswer) = NULL, void(*OnCanel)() = NULL ); virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 11dc237795..d75ede1e8a 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -58,7 +58,7 @@ const ScreenMessage SM_PlayComment = ScreenMessage(SM_User+1); const ScreenMessage SM_GoToAttractLoop = ScreenMessage(SM_User+13); -ScreenTitleMenu::ScreenTitleMenu() : ScreenSelect("ScreenTitleMenu") +ScreenTitleMenu::ScreenTitleMenu( CString sClassName ) : ScreenSelect( sClassName ) { LOG->Trace( "ScreenTitleMenu::ScreenTitleMenu()" ); diff --git a/stepmania/src/ScreenTitleMenu.h b/stepmania/src/ScreenTitleMenu.h index bb51065d74..887cc1bd02 100644 --- a/stepmania/src/ScreenTitleMenu.h +++ b/stepmania/src/ScreenTitleMenu.h @@ -22,7 +22,7 @@ class ScreenTitleMenu : public ScreenSelect { public: - ScreenTitleMenu(); + ScreenTitleMenu( CString sName ); virtual ~ScreenTitleMenu(); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp index 26facd7114..309a6467fe 100644 --- a/stepmania/src/ScreenUnlock.cpp +++ b/stepmania/src/ScreenUnlock.cpp @@ -38,7 +38,7 @@ #define POINTS_ZOOM THEME->GetMetricF("ScreenUnlock","PointsZoom") #define USE_UNLOCKS_DAT THEME->GetMetricI("ScreenUnlock","UseUnlocksDat") -ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock") +ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) { LOG->Trace("ScreenUnlock::ScreenUnlock()"); diff --git a/stepmania/src/ScreenUnlock.h b/stepmania/src/ScreenUnlock.h index 9396eda628..0ea911db1a 100644 --- a/stepmania/src/ScreenUnlock.h +++ b/stepmania/src/ScreenUnlock.h @@ -18,7 +18,7 @@ class Course; class ScreenUnlock : public ScreenAttract { public: - ScreenUnlock(); + ScreenUnlock( CString sName ); ~ScreenUnlock(); protected: diff --git a/stepmania/src/ScreenWarning.h b/stepmania/src/ScreenWarning.h index 2513e669f5..e6d80ca5e5 100644 --- a/stepmania/src/ScreenWarning.h +++ b/stepmania/src/ScreenWarning.h @@ -15,7 +15,7 @@ class ScreenWarning : public ScreenAttract { public: - ScreenWarning() : ScreenAttract("ScreenWarning") {}; + ScreenWarning( CString sClassName ) : ScreenAttract( sClassName ) {}; };