From e581d43cdb167937ccd152439c04a7cc4c00b552 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 05:09:11 +0000 Subject: [PATCH] Move m_sprDisqualify to ScreenPlayerOptions. --- stepmania/src/ScreenOptions.cpp | 13 ------------- stepmania/src/ScreenOptions.h | 3 --- stepmania/src/ScreenPlayerOptions.cpp | 13 +++++++++++++ stepmania/src/ScreenPlayerOptions.h | 3 +++ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 2d1febde6d..af1084492d 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -193,16 +193,6 @@ void ScreenOptions::Init() m_sprMore->SetDrawOrder( 2 ); m_framePage.AddChild( m_sprMore ); - FOREACH_PlayerNumber( p ) - { - m_sprDisqualify[p].Load( THEME->GetPathG(m_sName,"disqualify") ); - m_sprDisqualify[p]->SetName( ssprintf("DisqualifyP%i",p+1) ); - SET_XY( m_sprDisqualify[p] ); - m_sprDisqualify[p]->SetHidden( true ); // unhide later if handicapping options are discovered - m_sprDisqualify[p]->SetDrawOrder( 2 ); - m_framePage.AddChild( m_sprDisqualify[p] ); - } - m_OptionRowType.Load( m_sName ); } @@ -348,9 +338,6 @@ void ScreenOptions::TweenOnScreen() ON_COMMAND( m_sprMore ); - FOREACH_PlayerNumber( p ) - ON_COMMAND( m_sprDisqualify[p] ); - m_framePage.SortByDrawOrder(); } diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index a7f69af985..49e1505bd7 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -128,9 +128,6 @@ protected: AutoActor m_sprMore; - // show if the current selections will disqualify a high score - AutoActor m_sprDisqualify[NUM_PLAYERS]; - RageSound m_SoundChangeCol; RageSound m_SoundNextRow; RageSound m_SoundPrevRow; diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index ea4a11f897..1f7de0cea5 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -21,6 +21,16 @@ void ScreenPlayerOptions::Init() { ScreenOptionsMaster::Init(); + FOREACH_PlayerNumber( p ) + { + m_sprDisqualify[p].Load( THEME->GetPathG(m_sName,"disqualify") ); + m_sprDisqualify[p]->SetName( ssprintf("DisqualifyP%i",p+1) ); + SET_XY( m_sprDisqualify[p] ); + m_sprDisqualify[p]->SetHidden( true ); // unhide later if handicapping options are discovered + m_sprDisqualify[p]->SetDrawOrder( 2 ); + m_framePage.AddChild( m_sprDisqualify[p] ); + } + m_bAskOptionsMessage = !GAMESTATE->IsEditing() && PREFSMAN->m_ShowSongOptions == PrefsManager::ASK; @@ -61,6 +71,9 @@ void ScreenPlayerOptions::Init() void ScreenPlayerOptions::BeginScreen() { + FOREACH_PlayerNumber( p ) + ON_COMMAND( m_sprDisqualify[p] ); + ScreenOptionsMaster::BeginScreen(); FOREACH_HumanPlayer( p ) diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h index fd1f04577e..63872109b2 100644 --- a/stepmania/src/ScreenPlayerOptions.h +++ b/stepmania/src/ScreenPlayerOptions.h @@ -30,6 +30,9 @@ private: bool m_bAskOptionsMessage; Sprite m_sprOptionsMessage; + // show if the current selections will disqualify a high score + AutoActor m_sprDisqualify[NUM_PLAYERS]; + RageSound m_CancelAll; };