From 31355281e046d4104ef3e796dce5dd2a8f7b471d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 29 Sep 2003 06:27:20 +0000 Subject: [PATCH] Fix ModeChoice::DescribesCurrentMode messing with GAMESTATE->m_bChangedFailType. --- stepmania/src/ModeChoice.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ModeChoice.cpp b/stepmania/src/ModeChoice.cpp index 766aa28d79..0cb0258576 100644 --- a/stepmania/src/ModeChoice.cpp +++ b/stepmania/src/ModeChoice.cpp @@ -58,12 +58,11 @@ bool ModeChoice::DescribesCurrentMode( PlayerNumber pn ) const if( m_sModifiers != "" ) { - /* Save the current modifiers. */ - const PlayerOptions po = GAMESTATE->m_PlayerOptions[pn]; - const SongOptions so = GAMESTATE->m_SongOptions; - /* Apply modifiers. */ - GAMESTATE->ApplyModifiers( pn, m_sModifiers ); + PlayerOptions po = GAMESTATE->m_PlayerOptions[pn]; + SongOptions so = GAMESTATE->m_SongOptions; + po.FromString( m_sModifiers ); + so.FromString( m_sModifiers ); /* Did anything change? */ bool Changed = false; @@ -72,10 +71,6 @@ bool ModeChoice::DescribesCurrentMode( PlayerNumber pn ) const if( !CompareSongOptions(so, GAMESTATE->m_SongOptions) ) Changed = true; - /* Restore modifiers. */ - GAMESTATE->m_PlayerOptions[pn] = po; - GAMESTATE->m_SongOptions = so; - if( Changed ) return false; }