From 45a250b4ee923f7dc1e40511e7ea5cf51b2b73f3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 28 Sep 2003 04:34:15 +0000 Subject: [PATCH] Use ScreenOptionsMaster for ScreenOptionsMenu. --- stepmania/src/Screen.cpp | 4 ++++ stepmania/src/ScreenOptionsMaster.cpp | 1 + 2 files changed, 5 insertions(+) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index 39900379ba..52a634873d 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -328,6 +328,10 @@ Screen* Screen::Create( CString sClassName ) 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". */ diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index c234e6629e..c6290198f6 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -175,6 +175,7 @@ void ScreenOptionsMaster::SetCharacter( OptionRow &row, OptionRowHandler &hand ) ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ): ScreenOptions( sClassName ) { + LOG->Trace("ScreenOptionsMaster::ScreenOptionsMaster(%s)", m_sName.c_str() ); CStringArray Flags; split( OPTION_MENU_FLAGS, ";", Flags, true );