fix PrefsManager::m_sCurrentGame not current, so GamePrefs from Static.ini weren't being used

This commit is contained in:
Chris Danford
2005-10-28 01:44:19 +00:00
parent 8c52221570
commit 6e5b3a5ed8
11 changed files with 34 additions and 20 deletions
+2 -2
View File
@@ -85,7 +85,7 @@ bool GameCommand::DescribesCurrentModeForAllPlayers() const
bool GameCommand::DescribesCurrentMode( PlayerNumber pn ) const
{
if( m_pGame != NULL && m_pGame != GAMESTATE->m_pCurGame )
if( m_pGame != NULL && m_pGame != GAMESTATE->m_pCurGame.Get() )
return false;
if( m_pm != PLAY_MODE_INVALID && GAMESTATE->m_PlayMode != m_pm )
return false;
@@ -728,7 +728,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
const PlayMode OldPlayMode = GAMESTATE->m_PlayMode;
if( m_pGame != NULL )
GAMESTATE->m_pCurGame = m_pGame;
GAMESTATE->SetCurGame( m_pGame );
if( m_pm != PLAY_MODE_INVALID )
GAMESTATE->m_PlayMode.Set( m_pm );