Fix ModeChoice::DescribesCurrentMode messing with
GAMESTATE->m_bChangedFailType.
This commit is contained in:
@@ -58,12 +58,11 @@ bool ModeChoice::DescribesCurrentMode( PlayerNumber pn ) const
|
|||||||
|
|
||||||
if( m_sModifiers != "" )
|
if( m_sModifiers != "" )
|
||||||
{
|
{
|
||||||
/* Save the current modifiers. */
|
|
||||||
const PlayerOptions po = GAMESTATE->m_PlayerOptions[pn];
|
|
||||||
const SongOptions so = GAMESTATE->m_SongOptions;
|
|
||||||
|
|
||||||
/* Apply modifiers. */
|
/* 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? */
|
/* Did anything change? */
|
||||||
bool Changed = false;
|
bool Changed = false;
|
||||||
@@ -72,10 +71,6 @@ bool ModeChoice::DescribesCurrentMode( PlayerNumber pn ) const
|
|||||||
if( !CompareSongOptions(so, GAMESTATE->m_SongOptions) )
|
if( !CompareSongOptions(so, GAMESTATE->m_SongOptions) )
|
||||||
Changed = true;
|
Changed = true;
|
||||||
|
|
||||||
/* Restore modifiers. */
|
|
||||||
GAMESTATE->m_PlayerOptions[pn] = po;
|
|
||||||
GAMESTATE->m_SongOptions = so;
|
|
||||||
|
|
||||||
if( Changed )
|
if( Changed )
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user