phase out bEnableTimer
This commit is contained in:
@@ -64,7 +64,7 @@ OptionRow g_AppearanceOptionsLines[NUM_APPEARANCE_OPTIONS_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenAppearanceOptions::ScreenAppearanceOptions() :
|
ScreenAppearanceOptions::ScreenAppearanceOptions() :
|
||||||
ScreenOptions("ScreenAppearanceOptions",false)
|
ScreenOptions("ScreenAppearanceOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenAppearanceOptions::ScreenAppearanceOptions()" );
|
LOG->Trace( "ScreenAppearanceOptions::ScreenAppearanceOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ OptionRow g_AutogenOptionsLines[NUM_AUTOGEN_OPTIONS_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenAutogenOptions::ScreenAutogenOptions() :
|
ScreenAutogenOptions::ScreenAutogenOptions() :
|
||||||
ScreenOptions("ScreenAutogenOptions",false)
|
ScreenOptions("ScreenAutogenOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenAutogenOptions::ScreenAutogenOptions()" );
|
LOG->Trace( "ScreenAutogenOptions::ScreenAutogenOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ OptionRow g_BackgroundOptionsLines[NUM_BACKGROUND_OPTIONS_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenBackgroundOptions::ScreenBackgroundOptions() :
|
ScreenBackgroundOptions::ScreenBackgroundOptions() :
|
||||||
ScreenOptions("ScreenBackgroundOptions",false)
|
ScreenOptions("ScreenBackgroundOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenBackgroundOptions::ScreenBackgroundOptions()" );
|
LOG->Trace( "ScreenBackgroundOptions::ScreenBackgroundOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ ScreenEditCoursesMenu::ScreenEditCoursesMenu() : Screen("ScreenEditCoursesMenu")
|
|||||||
// m_Selector.AllowNewNotes();
|
// m_Selector.AllowNewNotes();
|
||||||
this->AddChild( &m_Selector );
|
this->AddChild( &m_Selector );
|
||||||
|
|
||||||
m_Menu.Load( "ScreenEditCoursesMenu", false ); // disable timer
|
m_Menu.Load( "ScreenEditCoursesMenu" );
|
||||||
this->AddChild( &m_Menu );
|
this->AddChild( &m_Menu );
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ ScreenEditMenu::ScreenEditMenu() : Screen("ScreenEditMenu")
|
|||||||
// m_Selector.AllowNewNotes();
|
// m_Selector.AllowNewNotes();
|
||||||
this->AddChild( &m_Selector );
|
this->AddChild( &m_Selector );
|
||||||
|
|
||||||
m_Menu.Load( "ScreenEditMenu", false ); // disable timer
|
m_Menu.Load( "ScreenEditMenu" );
|
||||||
this->AddChild( &m_Menu );
|
this->AddChild( &m_Menu );
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ OptionRow g_GameplayOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenGameplayOptions::ScreenGameplayOptions() :
|
ScreenGameplayOptions::ScreenGameplayOptions() :
|
||||||
ScreenOptions("ScreenGameplayOptions",false)
|
ScreenOptions("ScreenGameplayOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenGameplayOptions::ScreenGameplayOptions()" );
|
LOG->Trace( "ScreenGameplayOptions::ScreenGameplayOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ static const int TextureRes[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenGraphicOptions::ScreenGraphicOptions() :
|
ScreenGraphicOptions::ScreenGraphicOptions() :
|
||||||
ScreenOptions("ScreenGraphicOptions",false)
|
ScreenOptions("ScreenGraphicOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenGraphicOptions::ScreenGraphicOptions()" );
|
LOG->Trace( "ScreenGraphicOptions::ScreenGraphicOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ OptionRow g_InputOptionsLines[NUM_INPUT_OPTIONS_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenInputOptions::ScreenInputOptions() :
|
ScreenInputOptions::ScreenInputOptions() :
|
||||||
ScreenOptions("ScreenInputOptions",false)
|
ScreenOptions("ScreenInputOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenInputOptions::ScreenInputOptions()" );
|
LOG->Trace( "ScreenInputOptions::ScreenInputOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ ScreenJukeboxMenu::ScreenJukeboxMenu() : Screen("ScreenJukeboxMenu")
|
|||||||
// m_Selector.AllowNewNotes();
|
// m_Selector.AllowNewNotes();
|
||||||
this->AddChild( &m_Selector );
|
this->AddChild( &m_Selector );
|
||||||
|
|
||||||
m_Menu.Load( "ScreenJukeboxMenu", false ); // disable timer
|
m_Menu.Load( "ScreenJukeboxMenu" );
|
||||||
this->AddChild( &m_Menu );
|
this->AddChild( &m_Menu );
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ OptionRow g_MachineOptionsLines[NUM_MACHINE_OPTIONS_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenMachineOptions::ScreenMachineOptions() :
|
ScreenMachineOptions::ScreenMachineOptions() :
|
||||||
ScreenOptions("ScreenMachineOptions",false)
|
ScreenOptions("ScreenMachineOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenMachineOptions::ScreenMachineOptions()" );
|
LOG->Trace( "ScreenMachineOptions::ScreenMachineOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ ScreenMapControllers::ScreenMapControllers() : Screen("ScreenMapControllers")
|
|||||||
|
|
||||||
m_iWaitingForPress = 0;
|
m_iWaitingForPress = 0;
|
||||||
|
|
||||||
m_Menu.Load( "ScreenMapControllers", false ); // no timer
|
m_Menu.Load( "ScreenMapControllers" );
|
||||||
this->AddChild( &m_Menu );
|
this->AddChild( &m_Menu );
|
||||||
|
|
||||||
SOUND->PlayMusic( THEME->GetPathToS("ScreenMapControllers music") );
|
SOUND->PlayMusic( THEME->GetPathToS("ScreenMapControllers music") );
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ OptionRow g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenOptionsMenu::ScreenOptionsMenu() :
|
ScreenOptionsMenu::ScreenOptionsMenu() :
|
||||||
ScreenOptions("ScreenOptionsMenu",false)
|
ScreenOptions("ScreenOptionsMenu")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenOptionsMenu::ScreenOptionsMenu()" );
|
LOG->Trace( "ScreenOptionsMenu::ScreenOptionsMenu()" );
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ static const PlayerOptions::Effect ChoosableEffects[] =
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenPlayerOptions::ScreenPlayerOptions() :
|
ScreenPlayerOptions::ScreenPlayerOptions() :
|
||||||
ScreenOptions("ScreenPlayerOptions",true)
|
ScreenOptions("ScreenPlayerOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenPlayerOptions::ScreenPlayerOptions()" );
|
LOG->Trace( "ScreenPlayerOptions::ScreenPlayerOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ OptionRow g_ProfileOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenProfileOptions::ScreenProfileOptions() :
|
ScreenProfileOptions::ScreenProfileOptions() :
|
||||||
ScreenOptions("ScreenProfileOptions",false)
|
ScreenOptions("ScreenProfileOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenProfileOptions::ScreenProfileOptions()" );
|
LOG->Trace( "ScreenProfileOptions::ScreenProfileOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ OptionRow g_RaveOptionsLines[NUM_RAVE_OPTIONS_LINES] = {
|
|||||||
PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };
|
PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };
|
||||||
|
|
||||||
ScreenRaveOptions::ScreenRaveOptions() :
|
ScreenRaveOptions::ScreenRaveOptions() :
|
||||||
ScreenOptions("ScreenRaveOptions",true)
|
ScreenOptions("ScreenRaveOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenRaveOptions::ScreenRaveOptions()" );
|
LOG->Trace( "ScreenRaveOptions::ScreenRaveOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ OptionRow g_SelectGameLines[NUM_SELECT_GAME_LINES] =
|
|||||||
|
|
||||||
|
|
||||||
ScreenSelectGame::ScreenSelectGame() :
|
ScreenSelectGame::ScreenSelectGame() :
|
||||||
ScreenOptions("ScreenSelectGame",false)
|
ScreenOptions("ScreenSelectGame")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenSelectGame::ScreenSelectGame()" );
|
LOG->Trace( "ScreenSelectGame::ScreenSelectGame()" );
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ CString ScreenSongOptions::GetNextScreen()
|
|||||||
|
|
||||||
|
|
||||||
ScreenSongOptions::ScreenSongOptions() :
|
ScreenSongOptions::ScreenSongOptions() :
|
||||||
ScreenOptions("ScreenSongOptions",true)
|
ScreenOptions("ScreenSongOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenSongOptions::ScreenSongOptions()" );
|
LOG->Trace( "ScreenSongOptions::ScreenSongOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ OptionRow g_SoundOptionsLines[NUM_SOUND_OPTIONS_LINES] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ScreenSoundOptions::ScreenSoundOptions() :
|
ScreenSoundOptions::ScreenSoundOptions() :
|
||||||
ScreenOptions("ScreenSoundOptions",false)
|
ScreenOptions("ScreenSoundOptions")
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenSoundOptions::ScreenSoundOptions()" );
|
LOG->Trace( "ScreenSoundOptions::ScreenSoundOptions()" );
|
||||||
|
|
||||||
|
|||||||
@@ -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) ) );
|
m_Background.LoadFromAniDir( THEME->GetPathToB(ssprintf("ScreenStyleSplash-%s-%s-%d",sGameName.c_str(),sStyleName.c_str(),iDifficulty) ) );
|
||||||
this->AddChild( &m_Background );
|
this->AddChild( &m_Background );
|
||||||
|
|
||||||
m_Menu.Load( "ScreenStyleSplash", false );
|
m_Menu.Load( "ScreenStyleSplash" );
|
||||||
this->AddChild( &m_Menu );
|
this->AddChild( &m_Menu );
|
||||||
|
|
||||||
this->PostScreenMessage( SM_StartClosing, 2 );
|
this->PostScreenMessage( SM_StartClosing, 2 );
|
||||||
|
|||||||
Reference in New Issue
Block a user