Transition away from Screen(sName).

stepmania/src/ScreenNetRoom.cpp

@@ -28,14 +28,12 @@ AutoScreenMessage( SM_SMOnlinePack )
 AutoScreenMessage( SM_BackFromRoomName )
 AutoScreenMessage( SM_BackFromRoomDesc )
 
-REGISTER_SCREEN_CLASS( ScreenNetRoom );
+REGISTER_SCREEN_CLASS_NEW( ScreenNetRoom );
-ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sName )
-{
-	GAMESTATE->FinishStage();
-}
 
 void ScreenNetRoom::Init()
 {
+	GAMESTATE->FinishStage();
+
 	ScreenNetSelectBase::Init();
 
 	m_soundChangeSel.Load( THEME->GetPathS("ScreenNetRoom","change sel"));

stepmania/src/ScreenNetRoom.h

@@ -25,7 +25,6 @@ private:
 class ScreenNetRoom : public ScreenNetSelectBase
 {
 public:
-	ScreenNetRoom( const CString& sName );
 	virtual void Init();
 	virtual void Input( const InputEventPlus &input );
 	virtual void HandleScreenMessage( const ScreenMessage SM );

stepmania/src/ScreenNetSelectBase.cpp

@@ -32,10 +32,7 @@ AutoScreenMessage( SM_AddToChat )
 AutoScreenMessage( SM_UsersUpdate )
 AutoScreenMessage( SM_SMOnlinePack )
 
-REGISTER_SCREEN_CLASS( ScreenNetSelectBase );
+REGISTER_SCREEN_CLASS_NEW( ScreenNetSelectBase );
-ScreenNetSelectBase::ScreenNetSelectBase( const CString& sName ) : ScreenWithMenuElements( sName )
-{
-}
 
 void ScreenNetSelectBase::Init()
 {

stepmania/src/ScreenNetSelectBase.h

@@ -11,7 +11,6 @@
 class ScreenNetSelectBase : public ScreenWithMenuElements
 {
 public:
-	ScreenNetSelectBase( const CString& sName );
 	virtual void Init();
 
 	void Input( const InputEventPlus &input );

stepmania/src/ScreenNetSelectMusic.cpp

@@ -37,15 +37,13 @@ const CString AllGroups			= "[ALL MUSIC]";
 #define DIFFBG_WIDTH				THEME->GetMetricF(m_sName,"DiffBGWidth")
 #define DIFFBG_HEIGHT				THEME->GetMetricF(m_sName,"DiffBGHeight")
 
-REGISTER_SCREEN_CLASS( ScreenNetSelectMusic );
+REGISTER_SCREEN_CLASS_NEW( ScreenNetSelectMusic );
-ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSelectBase( sName )
-{
-	/* Finish any previous stage.  It's OK to call this when we havn't played a stage yet. */
-	GAMESTATE->FinishStage();
-}
 
 void ScreenNetSelectMusic::Init()
 {
+	/* Finish any previous stage.  It's OK to call this when we havn't played a stage yet. */
+	GAMESTATE->FinishStage();
+
 	ScreenNetSelectBase::Init();
 
 	//Diff Icon background

stepmania/src/ScreenNetSelectMusic.h

@@ -21,7 +21,6 @@
 class ScreenNetSelectMusic : public ScreenNetSelectBase
 {
 public:
-	ScreenNetSelectMusic( const CString& sName );
 	virtual void Init();
 
 	virtual void Input( const InputEventPlus &input );

stepmania/src/ScreenPackages.cpp

@@ -21,10 +21,7 @@
 
 AutoScreenMessage( SM_BackFromURL )
 
-REGISTER_SCREEN_CLASS( ScreenPackages );
+REGISTER_SCREEN_CLASS_NEW( ScreenPackages );
-ScreenPackages::ScreenPackages( CString sClassName ) : ScreenWithMenuElements( sClassName )
-{
-}
 
 void ScreenPackages::Init()
 {

stepmania/src/ScreenPackages.h

@@ -12,7 +12,6 @@
 class ScreenPackages : public ScreenWithMenuElements
 {
 public:
-	ScreenPackages( CString sName );
 	virtual void Init();
 
 	virtual void Input( const InputEventPlus &input );

stepmania/src/ScreenPrompt.cpp

@@ -45,11 +45,7 @@ void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const CString &sText, Prom
 
 
 
-REGISTER_SCREEN_CLASS( ScreenPrompt );
+REGISTER_SCREEN_CLASS_NEW( ScreenPrompt );
-ScreenPrompt::ScreenPrompt( const CString &sScreenName ):
-	ScreenWithMenuElements( sScreenName )
-{
-}
 
 void ScreenPrompt::Init()
 {

stepmania/src/ScreenPrompt.h

@@ -28,7 +28,6 @@ public:
 	static void SetPromptSettings( const CString &sText, PromptType type = PROMPT_OK, PromptAnswer defaultAnswer = ANSWER_NO, void(*OnYes)(void*) = NULL, void(*OnNo)(void*) = NULL, void* pCallbackData = NULL );
 	static void Prompt( ScreenMessage smSendOnPop, const CString &sText, PromptType type = PROMPT_OK, PromptAnswer defaultAnswer = ANSWER_NO, void(*OnYes)(void*) = NULL, void(*OnNo)(void*) = NULL, void* pCallbackData = NULL );
 
-	ScreenPrompt( const CString &sScreenName );
 	virtual void Init();
 	virtual void BeginScreen();
 	virtual void Input( const InputEventPlus &input );

stepmania/src/ScreenSaveSync.cpp

@@ -115,9 +115,11 @@ static void RevertSyncChanges( void* pThrowAway )
 	GAMESTATE->RevertSyncChanges();
 }
 
-REGISTER_SCREEN_CLASS( ScreenSaveSync );
+REGISTER_SCREEN_CLASS_NEW( ScreenSaveSync );
-ScreenSaveSync::ScreenSaveSync( CString sClassName ) : ScreenPrompt( sClassName )
+void ScreenSaveSync::Init()
 {
+	ScreenPrompt::Init();
+
 	ScreenPrompt::SetPromptSettings(
 		GetPromptText(), 
 		PROMPT_YES_NO, 

stepmania/src/ScreenSaveSync.h

@@ -8,7 +8,7 @@
 class ScreenSaveSync : public ScreenPrompt
 {
 public:
-	ScreenSaveSync( CString sName );
+	virtual void Init();
 
 	static void PromptSaveSync();
 };

stepmania/src/ScreenSelectCharacter.cpp

@@ -46,10 +46,7 @@ const PlayerNumber	CPU_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };
 
 
 
-REGISTER_SCREEN_CLASS( ScreenSelectCharacter );
+REGISTER_SCREEN_CLASS_NEW( ScreenSelectCharacter );
-ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithMenuElements( sClassName )
-{	
-}
 
 
 void ScreenSelectCharacter::Init()

stepmania/src/ScreenSelectCharacter.h

@@ -16,7 +16,6 @@
 class ScreenSelectCharacter : public ScreenWithMenuElements
 {
 public:
-	ScreenSelectCharacter( CString sName );
 	virtual void Init();
 	virtual ~ScreenSelectCharacter();
 

stepmania/src/ScreenSelectGroup.cpp

@@ -22,10 +22,7 @@
 #define BANNER_HEIGHT					THEME->GetMetricF("ScreenSelectGroup","BannerHeight")
 
 
-REGISTER_SCREEN_CLASS( ScreenSelectGroup );
+REGISTER_SCREEN_CLASS_NEW( ScreenSelectGroup );
-ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuElements( sClassName )
-{	
-}
 
 static LocalizedString ALL_MUSIC_STRING( "ScreenSelectGroup", "ALL MUSIC" );
 void ScreenSelectGroup::Init()

stepmania/src/ScreenSelectGroup.h

@@ -14,7 +14,6 @@
 class ScreenSelectGroup : public ScreenWithMenuElements
 {
 public:
-	ScreenSelectGroup( CString sName );
 	virtual void Init();
 
 	virtual void Input( const InputEventPlus &input );

stepmania/src/ScreenServiceAction.cpp

@@ -448,9 +448,11 @@ static CString ResetPreferences()
 
 
 
-REGISTER_SCREEN_CLASS( ScreenServiceAction );
+REGISTER_SCREEN_CLASS_NEW( ScreenServiceAction );
-ScreenServiceAction::ScreenServiceAction( CString sClassName ) : ScreenPrompt( sClassName )
+void ScreenServiceAction::Init()
 {
+	ScreenPrompt::Init();
+
 	CString sAction = THEME->GetMetric(m_sName,"Action");
 
 	CString (*pfn)() = NULL;

stepmania/src/ScreenServiceAction.h

@@ -8,7 +8,7 @@
 class ScreenServiceAction : public ScreenPrompt
 {
 public:
-	ScreenServiceAction( CString sName );
+	virtual void Init();
 };
 
 

stepmania/src/ScreenSetTime.cpp

@@ -37,10 +37,7 @@ static float GetTitleY( SetTimeSelection s ) { return g_Y[s]; }
 static float GetValueX( SetTimeSelection s ) { return g_X[s] + 80; }
 static float GetValueY( SetTimeSelection s ) { return g_Y[s]; }
 
-REGISTER_SCREEN_CLASS( ScreenSetTime );
+REGISTER_SCREEN_CLASS_NEW( ScreenSetTime );
-ScreenSetTime::ScreenSetTime( CString sClassName ) : ScreenWithMenuElements( sClassName )
-{
-}
 
 void ScreenSetTime::Init()
 {

stepmania/src/ScreenSetTime.h

@@ -18,7 +18,6 @@ enum SetTimeSelection
 class ScreenSetTime : public ScreenWithMenuElements
 {
 public:
-	ScreenSetTime( CString sName );
 	virtual void Init();
 
 	virtual void Update( float fDelta );

stepmania/src/ScreenTestInput.cpp

@@ -14,10 +14,7 @@
 #include "LocalizedString.h"
 
 
-REGISTER_SCREEN_CLASS( ScreenTestInput );
+REGISTER_SCREEN_CLASS_NEW( ScreenTestInput );
-ScreenTestInput::ScreenTestInput( CString sClassName ) : ScreenWithMenuElements( sClassName )
-{
-}
 
 void ScreenTestInput::Init()
 {

stepmania/src/ScreenTestInput.h

@@ -10,7 +10,6 @@
 class ScreenTestInput : public ScreenWithMenuElements
 {
 public:
-	ScreenTestInput( CString sName );
 	virtual void Init();
 	virtual ~ScreenTestInput();
 

stepmania/src/ScreenTestLights.cpp

@@ -11,14 +11,12 @@
 #include "InputEventPlus.h"
 #include "LocalizedString.h"
 
-REGISTER_SCREEN_CLASS( ScreenTestLights );
+REGISTER_SCREEN_CLASS_NEW( ScreenTestLights );
-ScreenTestLights::ScreenTestLights( CString sClassName ) : ScreenWithMenuElements( sClassName )
-{
-	LIGHTSMAN->SetLightsMode( LIGHTSMODE_TEST_AUTO_CYCLE );
-}
 
 void ScreenTestLights::Init()
 {
+	LIGHTSMAN->SetLightsMode( LIGHTSMODE_TEST_AUTO_CYCLE );
+
 	ScreenWithMenuElements::Init();
 
 	m_textInputs.SetName( "Text" );

stepmania/src/ScreenTestLights.h

@@ -8,7 +8,6 @@
 class ScreenTestLights : public ScreenWithMenuElements
 {
 public:
-	ScreenTestLights( CString sName );
 	virtual void Init();
 	virtual ~ScreenTestLights();
 

stepmania/src/ScreenTextEntry.cpp

@@ -71,12 +71,7 @@ bool ScreenTextEntry::s_bCancelledLast = false;
  * XXX: Don't allow internal-use codepoints (above 0xFFFF); those are
  * subject to change and shouldn't be written to disk.
  */
-REGISTER_SCREEN_CLASS( ScreenTextEntry );
+REGISTER_SCREEN_CLASS_NEW( ScreenTextEntry );
-
-ScreenTextEntry::ScreenTextEntry( CString sClassName ) :
-	ScreenWithMenuElements( sClassName )
-{
-}
 
 void ScreenTextEntry::Init()
 {

stepmania/src/ScreenTextEntry.h

@@ -41,7 +41,6 @@ public:
 		TextEntry( smSendOnPop, sQuestion, "", 255, NULL, OnOK, OnCanel, true );
 	}
 
-	ScreenTextEntry( CString sName );
 	~ScreenTextEntry();
 	virtual void Init();
 	virtual void BeginScreen();