Transition away from Screen(sName).

2006-01-15 19:49:02 +00:00
parent 3e456e60fd
commit 2b4c9e4516
49 changed files with 43 additions and 126 deletions
@@ -15,8 +15,8 @@
 #define SECONDS_TO_SHOW			THEME->GetMetricF(m_sName,"SecondsToShow")
 #define ALLOW_STYLE_TYPES		THEME->GetMetric (m_sName,"AllowStyleTypes")

-REGISTER_SCREEN_CLASS( ScreenDemonstration );
-ScreenDemonstration::ScreenDemonstration( CString sName ) : ScreenJukebox( sName )
+REGISTER_SCREEN_CLASS_NEW( ScreenDemonstration );
+ScreenDemonstration::ScreenDemonstration()
 {
 	m_bDemonstration = true;
 	SOUNDMAN->SetPlayOnlyCriticalSounds( !GAMESTATE->IsTimeToPlayAttractSounds() );  // mute attract sounds
@@ -9,7 +9,7 @@
 class ScreenDemonstration : public ScreenJukebox
 {
 public:
-	ScreenDemonstration( CString sName );
+	ScreenDemonstration();
 	virtual void Init();

 	virtual void HandleScreenMessage( const ScreenMessage SM );
@@ -834,7 +834,8 @@ ScreenMiniMenu *ScreenEdit::LoadEditMiniMenu( const MenuDef* pDef )
 	MenuDef menu("");
 	MakeFilteredMenuDef( pDef, menu );

-	ScreenMiniMenu *pScreen = new ScreenMiniMenu( pDef->sClassName );
+	ScreenMiniMenu *pScreen = new ScreenMiniMenu;
+	pScreen->SetName( pDef->sClassName );
 	Screen::InitScreen( pScreen );
 	pScreen->LoadMenu( &menu );
 	return pScreen;
@@ -334,7 +334,7 @@ GetNextVisiblePlayerInfo( vector<PlayerInfo>::iterator iter, vector<PlayerInfo>
 }


-ScreenGameplay::ScreenGameplay( CString sName ) : ScreenWithMenuElements(sName)
+ScreenGameplay::ScreenGameplay()
 {
 	m_pPlayerScoreList = NULL;
 }
@@ -99,7 +99,7 @@ public:
 class ScreenGameplay : public ScreenWithMenuElements
 {
 public:
-	ScreenGameplay( CString sName );
+	ScreenGameplay();
 	virtual void Init();
 	virtual ~ScreenGameplay();

@@ -5,8 +5,8 @@
 #include "PrefsManager.h"
 #include "StatsManager.h"

-REGISTER_SCREEN_CLASS( ScreenGameplayLesson );
-ScreenGameplayLesson::ScreenGameplayLesson( CString sName ) : ScreenGameplayNormal( sName )
+REGISTER_SCREEN_CLASS_NEW( ScreenGameplayLesson );
+ScreenGameplayLesson::ScreenGameplayLesson()
 {
 	m_iCurrentPageIndex = 0;
 	m_Try = Try_1;
@@ -9,7 +9,7 @@ class CourseEntry;
 class ScreenGameplayLesson : public ScreenGameplayNormal
 {
 public:
-	ScreenGameplayLesson( CString sName );
+	ScreenGameplayLesson();
 	virtual void Init();

 	virtual void Input( const InputEventPlus &input );
@@ -3,12 +3,7 @@
 #include "GameState.h"


-REGISTER_SCREEN_CLASS( ScreenGameplayMultiplayer );
-
-ScreenGameplayMultiplayer::ScreenGameplayMultiplayer( CString sName ) : ScreenGameplay(sName)
-{
-
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenGameplayMultiplayer );

 void ScreenGameplayMultiplayer::Init()
 {
@@ -9,7 +9,6 @@ class LyricsLoader;
 class ScreenGameplayMultiplayer : public ScreenGameplay
 {
 public:
-	ScreenGameplayMultiplayer( CString sName );
 	void Init();
 	virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
 	virtual void ScreenGameplayMultiplayer::LoadNextSong();
@@ -2,12 +2,7 @@
 #include "ScreenGameplayNormal.h"


-REGISTER_SCREEN_CLASS( ScreenGameplayNormal );
-
-ScreenGameplayNormal::ScreenGameplayNormal( CString sName ) : ScreenGameplay(sName)
-{
-
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenGameplayNormal );

 void ScreenGameplayNormal::FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut )
 {
@@ -9,7 +9,6 @@ class LyricsLoader;
 class ScreenGameplayNormal : public ScreenGameplay
 {
 public:
-	ScreenGameplayNormal( CString sName );
 	virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
 };

@@ -22,7 +22,7 @@

 #define SHOW_COURSE_MODIFIERS_PROBABILITY	THEME->GetMetricF(m_sName,"ShowCourseModifiersProbability")

-REGISTER_SCREEN_CLASS( ScreenJukebox );
+REGISTER_SCREEN_CLASS_NEW( ScreenJukebox );
 void ScreenJukebox::SetSong()
 {
 	ThemeMetric<bool>				ALLOW_ADVANCED_MODIFIERS(m_sName,"AllowAdvancedModifiers");
@@ -167,7 +167,7 @@ void ScreenJukebox::SetSong()
 	return;	// didn't find a song
 }

-ScreenJukebox::ScreenJukebox( CString sName ) : ScreenGameplayNormal( sName )
+ScreenJukebox::ScreenJukebox()
 {
 	m_bDemonstration = false;

@@ -9,7 +9,7 @@ class CourseEntry;
 class ScreenJukebox : public ScreenGameplayNormal
 {
 public:
-	ScreenJukebox( CString sName );
+	ScreenJukebox();
 	virtual void Init();

 	virtual void Input( const InputEventPlus &input );
@@ -17,7 +17,8 @@ vector<int>	ScreenMiniMenu::s_viLastAnswers;

 void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel, float fX, float fY )
 {
-	ScreenMiniMenu *pNewScreen = new ScreenMiniMenu( pDef->sClassName );
+	ScreenMiniMenu *pNewScreen = new ScreenMiniMenu;
+	pNewScreen->SetName( pDef->sClassName );
 	pNewScreen->Init();
 	pNewScreen->LoadMenu( pDef );
 	pNewScreen->SetOKMessage( SM_SendOnOK );
@@ -28,9 +29,6 @@ void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenM
 }

 //REGISTER_SCREEN_CLASS( ScreenMiniMenu );
-ScreenMiniMenu::ScreenMiniMenu( CString sClassName ) :ScreenOptions( sClassName )
-{
-}

 void ScreenMiniMenu::LoadMenu( const MenuDef* pDef )
 {
@@ -88,7 +88,6 @@ class ScreenMiniMenu : public ScreenOptions
 public:
 	static void MiniMenu( MenuDef* pDef, ScreenMessage smSendOnOK, ScreenMessage smSendOnCancel = SM_None, float fX = 0, float fY = 0 );

-	ScreenMiniMenu( CString sScreenClass );
 	void LoadMenu( const MenuDef* pDef );
 	void HandleScreenMessage( const ScreenMessage SM );

@@ -131,8 +131,8 @@ float HighScoreWheel::Scroll()
 	return GetTweenTimeLeft();
 }

-REGISTER_SCREEN_CLASS( ScreenNameEntryTraditional );
-ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : ScreenWithMenuElements( sClassName ),
+REGISTER_SCREEN_CLASS_NEW( ScreenNameEntryTraditional );
+ScreenNameEntryTraditional::ScreenNameEntryTraditional():
 	CHANGE_COMMAND("stoptweening;decelerate,.12")
 {
 	if( PREFSMAN->m_bScreenTestMode )
@@ -43,7 +43,7 @@ public:
 class ScreenNameEntryTraditional : public ScreenWithMenuElements
 {
 public:
-	ScreenNameEntryTraditional( CString sName );
+	ScreenNameEntryTraditional();
 	virtual void Init();
 	virtual ~ScreenNameEntryTraditional();

@@ -44,10 +44,7 @@ AutoScreenMessage( SM_ServerNameEnter )

 Preference<CString> g_sLastServer( "LastConnectedServer",	"" );

-REGISTER_SCREEN_CLASS( ScreenNetworkOptions );
-ScreenNetworkOptions::ScreenNetworkOptions( CString sClassName ) : ScreenOptions( sClassName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenNetworkOptions );

 void ScreenNetworkOptions::Init()
 {
@@ -6,7 +6,6 @@
 class ScreenNetworkOptions : public ScreenOptions
 {
 public:
-	ScreenNetworkOptions( CString sName );
 	virtual void Init();

 	virtual void HandleScreenMessage( const ScreenMessage SM );
@@ -73,7 +73,7 @@ static CString OPTION_EXPLANATION( CString s )
 }

 //REGISTER_SCREEN_CLASS( ScreenOptions );	// can't be instantiated
-ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sClassName)
+ScreenOptions::ScreenOptions()
 {
 	m_fLockInputSecs = 0.0001f;	// always lock for a tiny amount of time so that we throw away any queued inputs during the load.
 	
@@ -29,7 +29,7 @@ enum InputMode
 class ScreenOptions : public ScreenWithMenuElements
 {
 public:
-	ScreenOptions( CString sClassName );
+	ScreenOptions();
 	virtual void Init();
 	virtual void BeginScreen();
 	void InitMenu( const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands );
@@ -40,10 +40,7 @@ static MenuDef g_TempMenu(
 	"ScreenMiniMenuContext"
 );

-REGISTER_SCREEN_CLASS( ScreenOptionsEditCourse );
-ScreenOptionsEditCourse::ScreenOptionsEditCourse( CString sName ) : ScreenOptionsEditCourseSubMenu( sName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditCourse );

 void ScreenOptionsEditCourse::Init()
 {
@@ -7,8 +7,6 @@
 class ScreenOptionsEditCourse : public ScreenOptionsEditCourseSubMenu
 {
 public:
-	ScreenOptionsEditCourse( CString sName );
-
 	void Init();
 	virtual void BeginScreen();

@@ -45,10 +45,7 @@ static void FillSongsAndChoices( const CString &sSongGroup, vector<Song*> &vpSon
 }


-REGISTER_SCREEN_CLASS( ScreenOptionsEditCourseEntry );
-ScreenOptionsEditCourseEntry::ScreenOptionsEditCourseEntry( CString sName ) : ScreenOptionsEditCourseSubMenu( sName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditCourseEntry );

 void ScreenOptionsEditCourseEntry::Init()
 {
@@ -8,8 +8,6 @@ class Song;
 class ScreenOptionsEditCourseEntry : public ScreenOptionsEditCourseSubMenu
 {
 public:
-	ScreenOptionsEditCourseEntry( CString sName );
-
 	void Init();
 	void BeginScreen();

@@ -16,12 +16,7 @@ enum EditProfileRow
 	ROW_CHARACTER,
 };

-REGISTER_SCREEN_CLASS( ScreenOptionsEditProfile );
-ScreenOptionsEditProfile::ScreenOptionsEditProfile( CString sName ) : 
-	ScreenOptions( sName )
-{
-
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditProfile );

 void ScreenOptionsEditProfile::Init()
 {
@@ -7,7 +7,6 @@
 class ScreenOptionsEditProfile : public ScreenOptions
 {
 public:
-	ScreenOptionsEditProfile( CString sName );
 	virtual ~ScreenOptionsEditProfile();

 	virtual void Init();
@@ -63,11 +63,6 @@ static void SetNextCombination()
 	RefreshTrail();
 }

-ScreenOptionsEditCourseSubMenu::ScreenOptionsEditCourseSubMenu( CString sName ) : ScreenOptions( sName )
-{
-
-}
-
 void ScreenOptionsEditCourseSubMenu::MenuSelect( const InputEventPlus &input )
 {
 	if( input.type == IET_FIRST_PRESS )
@@ -132,10 +127,7 @@ static bool ValidateEditCourseName( const CString &sAnswer, CString &sErrorOut )
 }


-REGISTER_SCREEN_CLASS( ScreenOptionsManageCourses );
-ScreenOptionsManageCourses::ScreenOptionsManageCourses( CString sName ) : ScreenOptionsEditCourseSubMenu( sName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageCourses );

 void ScreenOptionsManageCourses::Init()
 {
@@ -9,8 +9,6 @@ class Course;
 class ScreenOptionsEditCourseSubMenu : public ScreenOptions
 {
 public:
-	ScreenOptionsEditCourseSubMenu( CString sName );
-
 protected:
 	virtual void MenuSelect( const InputEventPlus &input );
 };
@@ -18,8 +16,6 @@ protected:
 class ScreenOptionsManageCourses : public ScreenOptionsEditCourseSubMenu
 {
 public:
-	ScreenOptionsManageCourses( CString sName );
-
 	void Init();
 	virtual void BeginScreen();

@@ -64,10 +64,7 @@ static bool ValidateEditStepsDescription( const CString &sAnswer, CString &sErro
 }


-REGISTER_SCREEN_CLASS( ScreenOptionsManageEditSteps );
-ScreenOptionsManageEditSteps::ScreenOptionsManageEditSteps( CString sName ) : ScreenOptions( sName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageEditSteps );

 void ScreenOptionsManageEditSteps::Init()
 {
@@ -9,8 +9,6 @@ class Steps;
 class ScreenOptionsManageEditSteps : public ScreenOptions
 {
 public:
-	ScreenOptionsManageEditSteps( CString sName );
-
 	void Init();
 	virtual void BeginScreen();

@@ -74,10 +74,7 @@ static bool ValidateLocalProfileName( const CString &sAnswer, CString &sErrorOut
 	return true;
 }

-REGISTER_SCREEN_CLASS( ScreenOptionsManageProfiles );
-ScreenOptionsManageProfiles::ScreenOptionsManageProfiles( CString sName ) : ScreenOptions( sName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageProfiles );

 ScreenOptionsManageProfiles::~ScreenOptionsManageProfiles()
 {
@@ -96,7 +93,8 @@ void ScreenOptionsManageProfiles::Init()
 	SetNavigation( NAV_THREE_KEY_MENU );
 	SetInputMode( INPUTMODE_SHARE_CURSOR );

-	m_pContextMenu = new ScreenMiniMenu( g_TempMenu.sClassName );
+	m_pContextMenu = new ScreenMiniMenu;
+	m_pContextMenu->SetName( g_TempMenu.sClassName );
 	m_pContextMenu->Init();
 	m_pContextMenu->LoadMenu( &g_TempMenu );
 }
@@ -9,7 +9,6 @@ class Course;
 class ScreenOptionsManageProfiles : public ScreenOptions
 {
 public:
-	ScreenOptionsManageProfiles( CString sName );
 	~ScreenOptionsManageProfiles();

 	void Init();
@@ -21,11 +21,7 @@
 #define LINE(sLineName)				THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str()))


-REGISTER_SCREEN_CLASS( ScreenOptionsMaster );
-ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
-	ScreenOptions( sClassName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenOptionsMaster );

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

@@ -9,10 +9,7 @@
 #include "LocalizedString.h"


-REGISTER_SCREEN_CLASS( ScreenOptionsMemoryCard );
-ScreenOptionsMemoryCard::ScreenOptionsMemoryCard( CString sClassName ) : ScreenOptions( sClassName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenOptionsMemoryCard );

 void ScreenOptionsMemoryCard::Init()
 {
@@ -6,7 +6,6 @@
 class ScreenOptionsMemoryCard : public ScreenOptions
 {
 public:
-	ScreenOptionsMemoryCard( CString sName );
 	virtual void Init();
 	void BeginScreen();

@@ -15,11 +15,7 @@
 #include "Foreach.h"
 #include "InputEventPlus.h"

-REGISTER_SCREEN_CLASS( ScreenPlayerOptions );
-ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) :
-	ScreenOptionsMaster( sClassName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenPlayerOptions );

 void ScreenPlayerOptions::Init()
 {
@@ -9,7 +9,6 @@ struct lua_State;
 class ScreenPlayerOptions : public ScreenOptionsMaster
 {
 public:
-	ScreenPlayerOptions( CString sName );
 	virtual void Init();
 	virtual void BeginScreen();

@@ -15,7 +15,7 @@
 #include "Profile.h"
 #include "LocalizedString.h"

-REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin);
+REGISTER_SCREEN_CLASS_NEW(ScreenSMOnlineLogin);

 AutoScreenMessage( SM_SMOnlinePack )
 AutoScreenMessage( SM_PasswordDone )
@@ -24,10 +24,6 @@ OptionRowDefinition g_ProfileLine[1] = {
 	OptionRowDefinition("Profile",false)
 };

-ScreenSMOnlineLogin::ScreenSMOnlineLogin(CString sClassName) : ScreenOptions(sClassName)
-{
-}
-
 static LocalizedString DEFINE_A_PROFILE( "ScreenSMOnlineLogin", "You must define a Profile." );
 void ScreenSMOnlineLogin::Init()
 {
@@ -6,7 +6,6 @@
 class ScreenSMOnlineLogin : public ScreenOptions
 {
 public:
-	ScreenSMOnlineLogin(CString sName);
 	virtual void Init();
 	virtual void HandleScreenMessage(const ScreenMessage SM);
 	virtual void MenuStart( const InputEventPlus &input );
@@ -50,8 +50,8 @@ static bool g_bBannerWaiting = false;
 static bool g_bSampleMusicWaiting = false;
 static RageTimer g_StartedLoadingAt(RageZeroTimer);

-REGISTER_SCREEN_CLASS( ScreenSelectMusic );
-ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuElements( sClassName )
+REGISTER_SCREEN_CLASS_NEW( ScreenSelectMusic );
+ScreenSelectMusic::ScreenSelectMusic()
 {
 	if( PREFSMAN->m_bScreenTestMode )
 	{
@@ -28,7 +28,7 @@
 class ScreenSelectMusic : public ScreenWithMenuElements
 {
 public:
-	ScreenSelectMusic( CString sName );
+	ScreenSelectMusic();
 	virtual ~ScreenSelectMusic();
 	virtual void Init();
 	virtual void BeginScreen();
@@ -5,12 +5,7 @@
 #include "ThemeManager.h"
 #include "PrefsManager.h"

-REGISTER_SCREEN_CLASS( ScreenSongOptions );
-ScreenSongOptions::ScreenSongOptions( CString sClassName ) :
-	ScreenOptionsMaster( sClassName )
-{
-}
-
+REGISTER_SCREEN_CLASS_NEW( ScreenSongOptions );

 void ScreenSongOptions::Init()
 {
@@ -6,7 +6,6 @@
 class ScreenSongOptions : public ScreenOptionsMaster
 {
 public:
-	ScreenSongOptions( CString sName );
 	virtual void Init();

 private:
@@ -7,10 +7,7 @@
 AutoScreenMessage( SM_PrepScreen )


-REGISTER_SCREEN_CLASS( ScreenSplash );
-ScreenSplash::ScreenSplash( CString sClassName ) : ScreenWithMenuElements( sClassName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenSplash );

 void ScreenSplash::Init()
 {
@@ -9,7 +9,6 @@
 class ScreenSplash : public ScreenWithMenuElements
 {
 public:
-	ScreenSplash( CString sName );
 	virtual void Init();

 	virtual void HandleScreenMessage( const ScreenMessage SM );
@@ -14,8 +14,8 @@
 #include "ScreenDimensions.h"


-REGISTER_SCREEN_CLASS( ScreenSystemLayer );
-ScreenSystemLayer::ScreenSystemLayer( const CString &sName ) : Screen(sName)
+REGISTER_SCREEN_CLASS_NEW( ScreenSystemLayer );
+ScreenSystemLayer::ScreenSystemLayer()
 {
 	SubscribeToMessage( "RefreshCreditText" );
 	SubscribeToMessage( "SystemMessage" );
@@ -13,7 +13,7 @@
 class ScreenSystemLayer : public Screen
 {
 public:
-	ScreenSystemLayer( const CString &sName );
+	ScreenSystemLayer();
 	virtual ~ScreenSystemLayer();
 	virtual void Init();
 	void HandleMessage( const CString &sCommandName );