Move m_sprDisqualify to ScreenPlayerOptions.

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();
 }
 

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;

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 )

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;
 };