Allow screen aliasing.

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 );

stepmania/src/ScreenAlbums.h

@@ -15,7 +15,7 @@
 class ScreenAlbums : public ScreenAttract
 {
 public:
-	ScreenAlbums() : ScreenAttract("ScreenAlbums") { };
+	ScreenAlbums( CString sName ) : ScreenAttract(sName) { };
 
 };
 

stepmania/src/ScreenAppearanceOptions.cpp

@@ -63,8 +63,8 @@ OptionRow g_AppearanceOptionsLines[NUM_APPEARANCE_OPTIONS_LINES] = {
 	OptionRow( "Lyrics",			true, "HIDE","SHOW"),
 };
 
-ScreenAppearanceOptions::ScreenAppearanceOptions() :
+ScreenAppearanceOptions::ScreenAppearanceOptions( CString sName ) :
-	ScreenOptions("ScreenAppearanceOptions")
+	ScreenOptions(sName)
 {
 	LOG->Trace( "ScreenAppearanceOptions::ScreenAppearanceOptions()" );
 

stepmania/src/ScreenAppearanceOptions.h

@@ -16,7 +16,7 @@
 class ScreenAppearanceOptions : public ScreenOptions
 {
 public:
-	ScreenAppearanceOptions();
+	ScreenAppearanceOptions( CString sName );
 
 private:
 	void ImportOptions();

stepmania/src/ScreenAutogenOptions.cpp

@@ -33,8 +33,8 @@ OptionRow g_AutogenOptionsLines[NUM_AUTOGEN_OPTIONS_LINES] = {
 	OptionRow( "Autogen\nGroup Courses",	true, "OFF","ON" ),
 };
 
-ScreenAutogenOptions::ScreenAutogenOptions() :
+ScreenAutogenOptions::ScreenAutogenOptions( CString sName ) :
-	ScreenOptions("ScreenAutogenOptions")
+	ScreenOptions( sName )
 {
 	LOG->Trace( "ScreenAutogenOptions::ScreenAutogenOptions()" );
 

stepmania/src/ScreenAutogenOptions.h

@@ -16,7 +16,7 @@
 class ScreenAutogenOptions : public ScreenOptions
 {
 public:
-	ScreenAutogenOptions();
+	ScreenAutogenOptions( CString sName );
 
 private:
 	void ImportOptions();

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() :
+ScreenBackgroundOptions::ScreenBackgroundOptions( CString sName ) :
-	ScreenOptions("ScreenBackgroundOptions")
+	ScreenOptions( sName )
 {
 	LOG->Trace( "ScreenBackgroundOptions::ScreenBackgroundOptions()" );
 

stepmania/src/ScreenBackgroundOptions.h

@@ -14,7 +14,7 @@
 class ScreenBackgroundOptions : public ScreenOptions
 {
 public:
-	ScreenBackgroundOptions();
+	ScreenBackgroundOptions( CString sName );
 
 private:
 	void ImportOptions();

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;
 

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 );

stepmania/src/ScreenCompany.h

@@ -15,7 +15,7 @@
 class ScreenCompany : public ScreenAttract
 {
 public:
-	ScreenCompany() : ScreenAttract("ScreenCompany") { };
+	ScreenCompany( CString sName ) : ScreenAttract( sName ) { }
 
 };
 

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()" );
 

stepmania/src/ScreenCredits.h

@@ -17,7 +17,7 @@
 class ScreenCredits : public Screen
 {
 public:
-	ScreenCredits();
+	ScreenCredits( CString sName );
 	~ScreenCredits();
 
 	virtual void Update( float fDeltaTime );

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()" );
 

stepmania/src/ScreenDemonstration.h

@@ -15,7 +15,7 @@
 class ScreenDemonstration : public ScreenJukebox
 {
 public:
-	ScreenDemonstration();
+	ScreenDemonstration( CString sName );
 	~ScreenDemonstration();
 
 	virtual void Update( float fDeltaTime );

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()" );
 

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();

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()" );
 

stepmania/src/ScreenEditCoursesMenu.h

@@ -18,7 +18,7 @@
 class ScreenEditCoursesMenu : public Screen
 {
 public:
-	ScreenEditCoursesMenu();
+	ScreenEditCoursesMenu( CString sName );
 	virtual ~ScreenEditCoursesMenu();
 
 	virtual void DrawPrimitives();

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()" );
 

stepmania/src/ScreenEditMenu.h

@@ -18,7 +18,7 @@
 class ScreenEditMenu : public Screen
 {
 public:
-	ScreenEditMenu();
+	ScreenEditMenu( CString sName );
 	virtual ~ScreenEditMenu();
 
 	virtual void DrawPrimitives();

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) {};
 };
 
 

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;
 

stepmania/src/ScreenExit.h

@@ -10,7 +10,7 @@ class ScreenExit: public Screen
 	RageTimer m_ShutdownTimer;
 
 public:
-	ScreenExit();
+	ScreenExit( CString sName );
 	void Update( float fDelta );
 };
 

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;

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 );

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;

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 */

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();
 

stepmania/src/ScreenGameOver.h

@@ -17,7 +17,7 @@
 class ScreenGameOver : public Screen
 {
 public:
-	ScreenGameOver();
+	ScreenGameOver( CString sName );
 
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 

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()" );
 

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 );

stepmania/src/ScreenGameplayOptions.cpp

@@ -42,8 +42,8 @@ OptionRow g_GameplayOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = {
 	OptionRow( "Unlock\nSystem",		true, "OFF","ON" )
 };
 
-ScreenGameplayOptions::ScreenGameplayOptions() :
+ScreenGameplayOptions::ScreenGameplayOptions( CString sName ) :
-	ScreenOptions("ScreenGameplayOptions")
+	ScreenOptions( sName )
 {
 	LOG->Trace( "ScreenGameplayOptions::ScreenGameplayOptions()" );
 

stepmania/src/ScreenGameplayOptions.h

@@ -14,7 +14,7 @@
 class ScreenGameplayOptions : public ScreenOptions
 {
 public:
-	ScreenGameplayOptions();
+	ScreenGameplayOptions( CString sName );
 
 private:
 	void ImportOptions();

stepmania/src/ScreenGraphicOptions.cpp

@@ -58,8 +58,8 @@ static const int TextureRes[] = {
 	256, 512, 1024, 2048
 };
 
-ScreenGraphicOptions::ScreenGraphicOptions() :
+ScreenGraphicOptions::ScreenGraphicOptions( CString sName ) :
-	ScreenOptions("ScreenGraphicOptions")
+	ScreenOptions( sName )
 {
 	LOG->Trace( "ScreenGraphicOptions::ScreenGraphicOptions()" );
 

stepmania/src/ScreenGraphicOptions.h

@@ -16,7 +16,7 @@
 class ScreenGraphicOptions : public ScreenOptions
 {
 public:
-	ScreenGraphicOptions();
+	ScreenGraphicOptions( CString sClassName );
 
 private:
 	void UpdateRefreshRates();

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;

stepmania/src/ScreenHowToPlay.h

@@ -19,7 +19,7 @@
 class ScreenHowToPlay : public ScreenAttract
 {
 public:
-	ScreenHowToPlay();
+	ScreenHowToPlay( CString sName );
 	~ScreenHowToPlay();
 	
 	virtual void Update( float fDelta );

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() :
+ScreenInputOptions::ScreenInputOptions( CString sName ) :
-	ScreenOptions("ScreenInputOptions")
+	ScreenOptions( sName )
 {
 	LOG->Trace( "ScreenInputOptions::ScreenInputOptions()" );
 

stepmania/src/ScreenInputOptions.h

@@ -14,7 +14,7 @@
 class ScreenInputOptions : public ScreenOptions
 {
 public:
-	ScreenInputOptions();
+	ScreenInputOptions( CString sName );
 
 private:
 	void ImportOptions();

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()" );
 

stepmania/src/ScreenInstructions.h

@@ -21,7 +21,7 @@
 class ScreenInstructions : public Screen
 {
 public:
-	ScreenInstructions();
+	ScreenInstructions( CString sName );
 	virtual ~ScreenInstructions();
 
 	virtual void Update( float fDeltaTime );

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 );
 
 };

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()" );
 

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 );

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()" );
 

stepmania/src/ScreenJukeboxMenu.h

@@ -19,7 +19,7 @@
 class ScreenJukeboxMenu : public Screen
 {
 public:
-	ScreenJukeboxMenu();
+	ScreenJukeboxMenu( CString sName );
 	virtual ~ScreenJukeboxMenu();
 
 	virtual void DrawPrimitives();

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 );

stepmania/src/ScreenLogo.h

@@ -18,7 +18,7 @@
 class ScreenLogo : public ScreenAttract
 {
 public:
-	ScreenLogo();
+	ScreenLogo( CString sName );
 
 protected:
 	Sprite				m_sprLogo;

stepmania/src/ScreenMachineOptions.cpp

@@ -57,8 +57,8 @@ OptionRow g_MachineOptionsLines[NUM_MACHINE_OPTIONS_LINES] = {
 	OptionRow( "Song\nOptions",					true, "HIDE","SHOW","ASK" ),
 };
 
-ScreenMachineOptions::ScreenMachineOptions() :
+ScreenMachineOptions::ScreenMachineOptions( CString sClassName ) :
-	ScreenOptions("ScreenMachineOptions")
+	ScreenOptions( sClassName )
 {
 	LOG->Trace( "ScreenMachineOptions::ScreenMachineOptions()" );
 

stepmania/src/ScreenMachineOptions.h

@@ -16,7 +16,7 @@
 class ScreenMachineOptions : public ScreenOptions
 {
 public:
-	ScreenMachineOptions();
+	ScreenMachineOptions( CString sName );
 
 private:
 	void ImportOptions();

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 )

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()" );
 	

stepmania/src/ScreenMapControllers.h

@@ -22,7 +22,7 @@
 class ScreenMapControllers : public Screen
 {
 public:
-	ScreenMapControllers();
+	ScreenMapControllers( CString sName );
 	virtual ~ScreenMapControllers();
 
 	virtual void Update( float fDeltaTime );

stepmania/src/ScreenMemoryCard.h

@@ -15,7 +15,7 @@
 class ScreenMemoryCard : public ScreenAttract
 {
 public:
-	ScreenMemoryCard() : ScreenAttract("ScreenMemoryCard") { };
+	ScreenMemoryCard( CString sName ) : ScreenAttract( sName ) { };
 
 };
 

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 );

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()" );
 

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();

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()" );
 

stepmania/src/ScreenNameEntry.h

@@ -21,7 +21,7 @@
 class ScreenNameEntry : public Screen
 {
 public:
-	ScreenNameEntry();
+	ScreenNameEntry( CString sName );
 	virtual ~ScreenNameEntry();
 
 	virtual void Update( float fDeltaTime );

stepmania/src/ScreenOptionsMenu.cpp

@@ -56,8 +56,8 @@ OptionRow g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = {
 	OptionRow( "",	true, "Reload Songs/Courses" ),
 };
 
-ScreenOptionsMenu::ScreenOptionsMenu() :
+ScreenOptionsMenu::ScreenOptionsMenu( CString sClassName ) :
-	ScreenOptions("ScreenOptionsMenu")
+	ScreenOptions( sClassName )
 {
 	LOG->Trace( "ScreenOptionsMenu::ScreenOptionsMenu()" );
 

stepmania/src/ScreenOptionsMenu.h

@@ -16,7 +16,7 @@
 class ScreenOptionsMenu : public ScreenOptions
 {
 public:
-	ScreenOptionsMenu();
+	ScreenOptionsMenu( CString sName );
 
 protected:
 	void MenuStart( PlayerNumber pn );

stepmania/src/ScreenPlayerOptions.cpp

@@ -78,8 +78,8 @@ static const PlayerOptions::Effect ChoosableEffects[] =
 	PlayerOptions::NUM_EFFECTS
 };
 
-ScreenPlayerOptions::ScreenPlayerOptions() :
+ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) :
-	ScreenOptions("ScreenPlayerOptions")
+	ScreenOptions( sClassName )
 {
 	LOG->Trace( "ScreenPlayerOptions::ScreenPlayerOptions()" );
 	

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();

stepmania/src/ScreenProfileOptions.cpp

@@ -37,8 +37,7 @@ OptionRow g_ProfileOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = {
 	OptionRow( "Rename",			true ),
 };
 
-ScreenProfileOptions::ScreenProfileOptions() :
+ScreenProfileOptions::ScreenProfileOptions( CString sClassName ) : ScreenOptions( sClassName )
-	ScreenOptions("ScreenProfileOptions")
 {
 	LOG->Trace( "ScreenProfileOptions::ScreenProfileOptions()" );
 

stepmania/src/ScreenProfileOptions.h

@@ -14,7 +14,7 @@
 class ScreenProfileOptions : public ScreenOptions
 {
 public:
-	ScreenProfileOptions();
+	ScreenProfileOptions( CString sName );
 
 	virtual void MenuStart( PlayerNumber pn );
 

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 );

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 );

stepmania/src/ScreenRanking.h

@@ -20,7 +20,7 @@ class Course;
 class ScreenRanking : public ScreenAttract
 {
 public:
-	ScreenRanking();
+	ScreenRanking( CString sName );
 
 	void HandleScreenMessage( const ScreenMessage SM );
 

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() :
+ScreenRaveOptions::ScreenRaveOptions( CString sClassName ): ScreenOptions( sClassName )
-	ScreenOptions("ScreenRaveOptions")
 {
 	LOG->Trace( "ScreenRaveOptions::ScreenRaveOptions()" );
 

stepmania/src/ScreenRaveOptions.h

@@ -14,7 +14,7 @@
 class ScreenRaveOptions : public ScreenOptions
 {
 public:
-	ScreenRaveOptions();
+	ScreenRaveOptions( CString sName );
 
 private:
 	void ImportOptions();

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) );

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 );

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()" );	
 

stepmania/src/ScreenSelectCharacter.h

@@ -22,7 +22,7 @@
 class ScreenSelectCharacter : public Screen
 {
 public:
-	ScreenSelectCharacter();
+	ScreenSelectCharacter( CString sName );
 	virtual ~ScreenSelectCharacter();
 
 	virtual void DrawPrimitives();

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()" );
 

stepmania/src/ScreenSelectCourse.h

@@ -23,7 +23,7 @@
 class ScreenSelectCourse : public Screen
 {
 public:
-	ScreenSelectCourse();
+	ScreenSelectCourse( CString sName );
 	virtual ~ScreenSelectCourse();
 
 	virtual void DrawPrimitives();

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;

stepmania/src/ScreenSelectDifficulty.h

@@ -23,7 +23,7 @@
 class ScreenSelectDifficulty : public ScreenSelect
 {
 public:
-	ScreenSelectDifficulty();
+	ScreenSelectDifficulty( CString sName );
 
 	virtual void Update( float fDelta );
 

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;

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 );

stepmania/src/ScreenSelectGame.cpp

@@ -33,8 +33,8 @@ OptionRow g_SelectGameLines[NUM_SELECT_GAME_LINES] =
 };
 
 
-ScreenSelectGame::ScreenSelectGame() :
+ScreenSelectGame::ScreenSelectGame( CString sClassName ) :
-	ScreenOptions("ScreenSelectGame")
+	ScreenOptions( sClassName )
 {
 	LOG->Trace( "ScreenSelectGame::ScreenSelectGame()" );
 

stepmania/src/ScreenSelectGame.h

@@ -14,7 +14,7 @@
 class ScreenSelectGame : public ScreenOptions
 {
 public:
-	ScreenSelectGame();
+	ScreenSelectGame( CString sName );
 
 private:
 	void ImportOptions();

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()" );	
 

stepmania/src/ScreenSelectGroup.h

@@ -21,7 +21,7 @@
 class ScreenSelectGroup : public Screen
 {
 public:
-	ScreenSelectGroup();
+	ScreenSelectGroup( CString sName );
 	virtual ~ScreenSelectGroup();
 
 	virtual void DrawPrimitives();

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;
 

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 ) { }
 };
 
 

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"));

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 );

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()" );
 

stepmania/src/ScreenSelectMusic.h

@@ -30,7 +30,7 @@
 class ScreenSelectMusic : public Screen
 {
 public:
-	ScreenSelectMusic();
+	ScreenSelectMusic( CString sName );
 	virtual ~ScreenSelectMusic();
 
 	virtual void DrawPrimitives();

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;
 

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 );

stepmania/src/ScreenSongOptions.cpp

@@ -52,8 +52,8 @@ CString ScreenSongOptions::GetNextScreen()
 }
 
 
-ScreenSongOptions::ScreenSongOptions() :
+ScreenSongOptions::ScreenSongOptions( CString sClassName ) :
-	ScreenOptions("ScreenSongOptions")
+	ScreenOptions( sClassName )
 {
 	LOG->Trace( "ScreenSongOptions::ScreenSongOptions()" );
 

stepmania/src/ScreenSongOptions.h

@@ -15,7 +15,7 @@
 class ScreenSongOptions : public ScreenOptions
 {
 public:
-	ScreenSongOptions();
+	ScreenSongOptions( CString sName );
 	static CString GetNextScreen();
 
 private:

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() :
+ScreenSoundOptions::ScreenSoundOptions( CString sClassName ) :
-	ScreenOptions("ScreenSoundOptions")
+	ScreenOptions( sClassName )
 {
 	LOG->Trace( "ScreenSoundOptions::ScreenSoundOptions()" );
 

stepmania/src/ScreenSoundOptions.h

@@ -17,7 +17,7 @@
 class ScreenSoundOptions : public ScreenOptions
 {
 public:
-	ScreenSoundOptions();
+	ScreenSoundOptions( CString sName );
 
 private:
 	void ImportOptions();

stepmania/src/ScreenStage.cpp

@@ -52,7 +52,7 @@ enum StageMode
 };
 */
 
-ScreenStage::ScreenStage() : Screen("ScreenStage")
+ScreenStage::ScreenStage( CString sClassName ) : Screen( sClassName )
 {
 	SOUND->StopMusic();
 

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();

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();