From d6a8442a93a0996d5a8419dff25b4bd0190188f3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 15 Feb 2004 01:39:54 +0000 Subject: [PATCH] cleanup --- stepmania/Themes/default/metrics.ini | 1 + stepmania/src/Screen.cpp | 33 ---------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 6b33841060..bcc0c7a360 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1143,6 +1143,7 @@ SongPositionMeterOnCommand=hidden,1 SongPositionMeterOffCommand= [ScreenEvaluation] +Class=ScreenEvaluation FailedSoundTime=0 PassedSoundTime=0 NumSequenceSounds=0 diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index c2b751e5af..2114f65e93 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -295,39 +295,6 @@ void Screen::ClearMessageQueue( const ScreenMessage SM ) Screen* Screen::Create( CString sClassName ) { - /* These are just compatibility aliases. */ - if( !sClassName.CompareNoCase("ScreenCompany") ) - sClassName = "ScreenCompany@ScreenAttract"; - if( !sClassName.CompareNoCase("ScreenIntroMovie") ) - sClassName = "ScreenIntroMovie@ScreenAttract"; - if( !sClassName.CompareNoCase("ScreenAlbums") ) - sClassName = "ScreenAlbums@ScreenAttract"; - if( !sClassName.CompareNoCase("ScreenWarning") ) - sClassName = "ScreenWarning@ScreenAttract"; - if( !sClassName.CompareNoCase("ScreenMemoryCard") ) - sClassName = "ScreenMemoryCard@ScreenAttract"; - - if( !sClassName.CompareNoCase("ScreenEvaluationStage") ) - sClassName = "ScreenEvaluationStage@ScreenEvaluation"; - if( !sClassName.CompareNoCase("ScreenEvaluationSummary") ) - sClassName = "ScreenEvaluationSummary@ScreenEvaluation"; - if( !sClassName.CompareNoCase("ScreenEvaluationNonstop") ) - sClassName = "ScreenEvaluationNonstop@ScreenEvaluation"; - if( !sClassName.CompareNoCase("ScreenEvaluationOni") ) - sClassName = "ScreenEvaluationOni@ScreenEvaluation"; - if( !sClassName.CompareNoCase("ScreenEvaluationEndless") ) - sClassName = "ScreenEvaluationEndless@ScreenEvaluation"; - if( !sClassName.CompareNoCase("ScreenEvaluationEndless") ) - sClassName = "ScreenEvaluationEndless@ScreenEvaluation"; - if( !sClassName.CompareNoCase("ScreenEvaluationBattle") ) - sClassName = "ScreenEvaluationBattle@ScreenEvaluation"; - if( !sClassName.CompareNoCase("ScreenEvaluationRave") ) - sClassName = "ScreenEvaluationRave@ScreenEvaluation"; - - /* This one will go away when all options menus are converted. */ - if( !sClassName.CompareNoCase("ScreenOptionsMenu") ) - sClassName = "ScreenOptionsMenu@ScreenOptionsMaster"; - /* "ScreenCompany@ScreenAttract" loads ScreenAttract with the asset name * "ScreenCompany", so (if it supports it) it'll use metric, graphic, etc. * names starting with "ScreenCompany". */