actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use ScreenOptionsMaster for ScreenOptionsMenu.

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-28 04:34:15 +00:00
parent 7de3907afc
commit 45a250b4ee
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Screen.cpp
+4
View File
@@ -328,6 +328,10 @@ Screen* Screen::Create( CString sClassName )
if( !sClassName.CompareNoCase("ScreenEvaluationRave") ) if( !sClassName.CompareNoCase("ScreenEvaluationRave") )
sClassName = "ScreenEvaluationRave@ScreenEvaluation"; 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@ScreenAttract" loads ScreenAttract with the asset name
* "ScreenCompany", so (if it supports it) it'll use metric, graphic, etc. * "ScreenCompany", so (if it supports it) it'll use metric, graphic, etc.
* names starting with "ScreenCompany". */ * names starting with "ScreenCompany". */
stepmania/src/ScreenOptionsMaster.cpp
+1
View File
@@ -175,6 +175,7 @@ void ScreenOptionsMaster::SetCharacter( OptionRow &row, OptionRowHandler &hand )
ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ): ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
ScreenOptions( sClassName ) ScreenOptions( sClassName )
{ {
LOG->Trace("ScreenOptionsMaster::ScreenOptionsMaster(%s)", m_sName.c_str() );
CStringArray Flags; CStringArray Flags;
split( OPTION_MENU_FLAGS, ";", Flags, true ); split( OPTION_MENU_FLAGS, ";", Flags, true );