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
+8 -2
View File
@@ -425,7 +425,7 @@ void PrefsManager::ResetToFactoryDefaults()
SavePrefsToDisk();
}
void PrefsManager::ReadPrefsFromFile( CString sIni )
void PrefsManager::ReadPrefsFromFile( const CString &sIni )
{
IniFile ini;
if( !ini.ReadFile(sIni) )
@@ -512,13 +512,19 @@ CString PrefsManager::GetMovieDrivers()
return m_sMovieDrivers;
}
CString PrefsManager::GetLightsDriver() {
CString PrefsManager::GetLightsDriver()
{
if ( m_sLightsDriver.Get().empty() )
return (CString)DEFAULT_LIGHTS_DRIVER;
else
return m_sLightsDriver;
}
PrefsManager::GamePrefs &PrefsManager::GetCurrentGamePrefs()
{
ASSERT( !m_sCurrentGame.Get().empty() );
return m_mapGameNameToGamePrefs[m_sCurrentGame];
}
// lua start
#include "LuaBinding.h"