From cab5a19535657f4fa4989bb38dc1544da46fe079 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 27 Sep 2003 22:54:34 +0000 Subject: [PATCH] Remove some aliasing screens. (These aliases in Create() aren't really needed; they're just to reduce theme incompatibility.) --- stepmania/src/Screen.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index a83724fd5d..6b7447cec5 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -273,12 +273,8 @@ void Screen::ClearMessageQueue( const ScreenMessage SM ) #include "ScreenTestSound.h" #include "ScreenTitleMenu.h" #include "ScreenEz2SelectMusic.h" -#include "ScreenWarning.h" #include "ScreenRanking.h" #include "ScreenMemoryCard.h" -#include "ScreenCompany.h" -#include "ScreenIntroMovie.h" -#include "ScreenAlbums.h" #include "ScreenLogo.h" #include "ScreenUnlock.h" #include "ScreenDemonstration.h" @@ -303,6 +299,16 @@ void Screen::ClearMessageQueue( const ScreenMessage SM ) Screen* Screen::Create( CString sClassName ) { + /* These are just compatibility aliases. */ + if( !sClassName.CompareNoCase("ScreenCompany") ) + sClassName = "ScreenAttract@ScreenCompany"; + if( !sClassName.CompareNoCase("ScreenIntroMovie") ) + sClassName = "ScreenAttract@ScreenIntroMovie"; + if( !sClassName.CompareNoCase("ScreenAlbums") ) + sClassName = "ScreenAttract@ScreenAlbums"; + if( !sClassName.CompareNoCase("ScreenWarning") ) + sClassName = "ScreenAttract@ScreenWarning"; + /* "ScreenCompany@ScreenOtherCompany" loads ScreenCompany with the * asset "ScreenOtherCompany", so (if it supports it) it'll use * metric, graphic, etc. names starting with "ScreenOtherCompany". */ @@ -360,11 +366,7 @@ Screen* Screen::Create( CString sClassName ) IF_RETURN( ScreenTestSound ); IF_RETURN( ScreenTitleMenu ); IF_RETURN( ScreenEz2SelectMusic ); - IF_RETURN( ScreenWarning ); IF_RETURN( ScreenRanking ); - IF_RETURN( ScreenCompany ); - IF_RETURN( ScreenIntroMovie ); - IF_RETURN( ScreenAlbums ); IF_RETURN( ScreenLogo ); IF_RETURN( ScreenUnlock ); IF_RETURN( ScreenDemonstration );