diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp index 68337c4752..237b980e02 100644 --- a/stepmania/src/ScreenAppearanceOptions.cpp +++ b/stepmania/src/ScreenAppearanceOptions.cpp @@ -64,7 +64,7 @@ OptionRow g_AppearanceOptionsLines[NUM_APPEARANCE_OPTIONS_LINES] = { }; ScreenAppearanceOptions::ScreenAppearanceOptions() : - ScreenOptions("ScreenAppearanceOptions",false) + ScreenOptions("ScreenAppearanceOptions") { LOG->Trace( "ScreenAppearanceOptions::ScreenAppearanceOptions()" ); diff --git a/stepmania/src/ScreenAutogenOptions.cpp b/stepmania/src/ScreenAutogenOptions.cpp index f0091c67cd..d568922cb4 100644 --- a/stepmania/src/ScreenAutogenOptions.cpp +++ b/stepmania/src/ScreenAutogenOptions.cpp @@ -34,7 +34,7 @@ OptionRow g_AutogenOptionsLines[NUM_AUTOGEN_OPTIONS_LINES] = { }; ScreenAutogenOptions::ScreenAutogenOptions() : - ScreenOptions("ScreenAutogenOptions",false) + ScreenOptions("ScreenAutogenOptions") { LOG->Trace( "ScreenAutogenOptions::ScreenAutogenOptions()" ); diff --git a/stepmania/src/ScreenBackgroundOptions.cpp b/stepmania/src/ScreenBackgroundOptions.cpp index ca30457812..76729be4d2 100644 --- a/stepmania/src/ScreenBackgroundOptions.cpp +++ b/stepmania/src/ScreenBackgroundOptions.cpp @@ -43,7 +43,7 @@ OptionRow g_BackgroundOptionsLines[NUM_BACKGROUND_OPTIONS_LINES] = { }; ScreenBackgroundOptions::ScreenBackgroundOptions() : - ScreenOptions("ScreenBackgroundOptions",false) + ScreenOptions("ScreenBackgroundOptions") { LOG->Trace( "ScreenBackgroundOptions::ScreenBackgroundOptions()" ); diff --git a/stepmania/src/ScreenEditCoursesMenu.cpp b/stepmania/src/ScreenEditCoursesMenu.cpp index 0198241f57..de6e5886a8 100644 --- a/stepmania/src/ScreenEditCoursesMenu.cpp +++ b/stepmania/src/ScreenEditCoursesMenu.cpp @@ -44,7 +44,7 @@ ScreenEditCoursesMenu::ScreenEditCoursesMenu() : Screen("ScreenEditCoursesMenu") // m_Selector.AllowNewNotes(); this->AddChild( &m_Selector ); - m_Menu.Load( "ScreenEditCoursesMenu", false ); // disable timer + m_Menu.Load( "ScreenEditCoursesMenu" ); this->AddChild( &m_Menu ); diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 8ce1a03bc9..4222afc846 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -44,7 +44,7 @@ ScreenEditMenu::ScreenEditMenu() : Screen("ScreenEditMenu") // m_Selector.AllowNewNotes(); this->AddChild( &m_Selector ); - m_Menu.Load( "ScreenEditMenu", false ); // disable timer + m_Menu.Load( "ScreenEditMenu" ); this->AddChild( &m_Menu ); diff --git a/stepmania/src/ScreenGameplayOptions.cpp b/stepmania/src/ScreenGameplayOptions.cpp index 5699d3c203..490ce434fc 100644 --- a/stepmania/src/ScreenGameplayOptions.cpp +++ b/stepmania/src/ScreenGameplayOptions.cpp @@ -43,7 +43,7 @@ OptionRow g_GameplayOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = { }; ScreenGameplayOptions::ScreenGameplayOptions() : - ScreenOptions("ScreenGameplayOptions",false) + ScreenOptions("ScreenGameplayOptions") { LOG->Trace( "ScreenGameplayOptions::ScreenGameplayOptions()" ); diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp index 8346e22ac2..69f5e70135 100644 --- a/stepmania/src/ScreenGraphicOptions.cpp +++ b/stepmania/src/ScreenGraphicOptions.cpp @@ -59,7 +59,7 @@ static const int TextureRes[] = { }; ScreenGraphicOptions::ScreenGraphicOptions() : - ScreenOptions("ScreenGraphicOptions",false) + ScreenOptions("ScreenGraphicOptions") { LOG->Trace( "ScreenGraphicOptions::ScreenGraphicOptions()" ); diff --git a/stepmania/src/ScreenInputOptions.cpp b/stepmania/src/ScreenInputOptions.cpp index 059a915de8..3d363072e8 100644 --- a/stepmania/src/ScreenInputOptions.cpp +++ b/stepmania/src/ScreenInputOptions.cpp @@ -44,7 +44,7 @@ OptionRow g_InputOptionsLines[NUM_INPUT_OPTIONS_LINES] = { }; ScreenInputOptions::ScreenInputOptions() : - ScreenOptions("ScreenInputOptions",false) + ScreenOptions("ScreenInputOptions") { LOG->Trace( "ScreenInputOptions::ScreenInputOptions()" ); diff --git a/stepmania/src/ScreenJukeboxMenu.cpp b/stepmania/src/ScreenJukeboxMenu.cpp index f7c4dcb563..d050b03902 100644 --- a/stepmania/src/ScreenJukeboxMenu.cpp +++ b/stepmania/src/ScreenJukeboxMenu.cpp @@ -43,7 +43,7 @@ ScreenJukeboxMenu::ScreenJukeboxMenu() : Screen("ScreenJukeboxMenu") // m_Selector.AllowNewNotes(); this->AddChild( &m_Selector ); - m_Menu.Load( "ScreenJukeboxMenu", false ); // disable timer + m_Menu.Load( "ScreenJukeboxMenu" ); this->AddChild( &m_Menu ); diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp index bfc6bb3ef2..a6c5691c16 100644 --- a/stepmania/src/ScreenMachineOptions.cpp +++ b/stepmania/src/ScreenMachineOptions.cpp @@ -58,7 +58,7 @@ OptionRow g_MachineOptionsLines[NUM_MACHINE_OPTIONS_LINES] = { }; ScreenMachineOptions::ScreenMachineOptions() : - ScreenOptions("ScreenMachineOptions",false) + ScreenOptions("ScreenMachineOptions") { LOG->Trace( "ScreenMachineOptions::ScreenMachineOptions()" ); diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 2abcfcc22a..44b762494d 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -100,7 +100,7 @@ ScreenMapControllers::ScreenMapControllers() : Screen("ScreenMapControllers") m_iWaitingForPress = 0; - m_Menu.Load( "ScreenMapControllers", false ); // no timer + m_Menu.Load( "ScreenMapControllers" ); this->AddChild( &m_Menu ); SOUND->PlayMusic( THEME->GetPathToS("ScreenMapControllers music") ); diff --git a/stepmania/src/ScreenOptionsMenu.cpp b/stepmania/src/ScreenOptionsMenu.cpp index 8f6e15ded4..10980591dd 100644 --- a/stepmania/src/ScreenOptionsMenu.cpp +++ b/stepmania/src/ScreenOptionsMenu.cpp @@ -57,7 +57,7 @@ OptionRow g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = { }; ScreenOptionsMenu::ScreenOptionsMenu() : - ScreenOptions("ScreenOptionsMenu",false) + ScreenOptions("ScreenOptionsMenu") { LOG->Trace( "ScreenOptionsMenu::ScreenOptionsMenu()" ); diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 57b1de6a1d..af44e5dfcf 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -79,7 +79,7 @@ static const PlayerOptions::Effect ChoosableEffects[] = }; ScreenPlayerOptions::ScreenPlayerOptions() : - ScreenOptions("ScreenPlayerOptions",true) + ScreenOptions("ScreenPlayerOptions") { LOG->Trace( "ScreenPlayerOptions::ScreenPlayerOptions()" ); diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index bbcebb8b64..854cc73bae 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -38,7 +38,7 @@ OptionRow g_ProfileOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = { }; ScreenProfileOptions::ScreenProfileOptions() : - ScreenOptions("ScreenProfileOptions",false) + ScreenOptions("ScreenProfileOptions") { LOG->Trace( "ScreenProfileOptions::ScreenProfileOptions()" ); diff --git a/stepmania/src/ScreenRaveOptions.cpp b/stepmania/src/ScreenRaveOptions.cpp index 0d8ac68bbd..ddcedb5ea4 100644 --- a/stepmania/src/ScreenRaveOptions.cpp +++ b/stepmania/src/ScreenRaveOptions.cpp @@ -41,7 +41,7 @@ OptionRow g_RaveOptionsLines[NUM_RAVE_OPTIONS_LINES] = { PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 }; ScreenRaveOptions::ScreenRaveOptions() : - ScreenOptions("ScreenRaveOptions",true) + ScreenOptions("ScreenRaveOptions") { LOG->Trace( "ScreenRaveOptions::ScreenRaveOptions()" ); diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp index 5ef82ebf55..91ba024a04 100644 --- a/stepmania/src/ScreenSelectGame.cpp +++ b/stepmania/src/ScreenSelectGame.cpp @@ -34,7 +34,7 @@ OptionRow g_SelectGameLines[NUM_SELECT_GAME_LINES] = ScreenSelectGame::ScreenSelectGame() : - ScreenOptions("ScreenSelectGame",false) + ScreenOptions("ScreenSelectGame") { LOG->Trace( "ScreenSelectGame::ScreenSelectGame()" ); diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index 96496e94c5..573915240b 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -53,7 +53,7 @@ CString ScreenSongOptions::GetNextScreen() ScreenSongOptions::ScreenSongOptions() : - ScreenOptions("ScreenSongOptions",true) + ScreenOptions("ScreenSongOptions") { LOG->Trace( "ScreenSongOptions::ScreenSongOptions()" ); diff --git a/stepmania/src/ScreenSoundOptions.cpp b/stepmania/src/ScreenSoundOptions.cpp index b7071cf822..5bd3467267 100644 --- a/stepmania/src/ScreenSoundOptions.cpp +++ b/stepmania/src/ScreenSoundOptions.cpp @@ -42,7 +42,7 @@ OptionRow g_SoundOptionsLines[NUM_SOUND_OPTIONS_LINES] = { }; ScreenSoundOptions::ScreenSoundOptions() : - ScreenOptions("ScreenSoundOptions",false) + ScreenOptions("ScreenSoundOptions") { LOG->Trace( "ScreenSoundOptions::ScreenSoundOptions()" ); diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp index 82319d26f7..073b5ae6a5 100644 --- a/stepmania/src/ScreenStyleSplash.cpp +++ b/stepmania/src/ScreenStyleSplash.cpp @@ -50,7 +50,7 @@ ScreenStyleSplash::ScreenStyleSplash() : Screen("ScreenStyleSplash") m_Background.LoadFromAniDir( THEME->GetPathToB(ssprintf("ScreenStyleSplash-%s-%s-%d",sGameName.c_str(),sStyleName.c_str(),iDifficulty) ) ); this->AddChild( &m_Background ); - m_Menu.Load( "ScreenStyleSplash", false ); + m_Menu.Load( "ScreenStyleSplash" ); this->AddChild( &m_Menu ); this->PostScreenMessage( SM_StartClosing, 2 );