From be1e448cb25c601f251775a460ae8d6a680de4fe Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Fri, 18 Aug 2006 01:26:50 +0000
Subject: [PATCH] Extra stage isn't the only thing that might want to force
 stage mods.

---
 stepmania/src/GameState.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 5805b77b42..6868976a75 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -60,6 +60,8 @@ Song* GameState::GetDefaultSong() const
 	return sid.ToSong();
 }
 
+static DynamicThemeMetric<bool> ARE_STAGE_MODS_FORCED( "GameState","AreStageModsForced" );
+
 
 GameState::GameState() :
 	m_pCurGame(			Message_CurrentGameChanged ),
@@ -484,8 +486,7 @@ void GameState::BeginStage()
 
 	ResetStageStatistics();
 
-	// Stage mods for extra stage have already been set. Don't overwrite preferred.
-	if( !IsAnExtraStage() )
+	if( !ARE_STAGE_MODS_FORCED )
 	{
 		FOREACH_PlayerNumber( p )
 			m_pPlayerState[p]->m_PlayerOptions.Assign( ModsLevel_Stage, m_pPlayerState[p]->m_PlayerOptions.GetPreferred() );