mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13309) -Fix: the difficulty settings from the savegame would be reset by the ones of the intro game.

release/0.7
rubidium 2008-05-28 14:36:06 +00:00
parent 9e863e1dbb
commit 17ccd5ec65
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/settings.cpp
View File

@ -1793,15 +1793,25 @@ static const SettingDesc _currency_settings[] = {
#undef NO #undef NO
#undef CR #undef CR
/**
* Prepare for reading and old diff_custom by zero-ing the memory.
*/
static void PrepareOldDiffCustom() static void PrepareOldDiffCustom()
{ {
memset(_old_diff_custom, 0, sizeof(_old_diff_custom)); memset(_old_diff_custom, 0, sizeof(_old_diff_custom));
} }
static void HandleOldDiffCustom() /**
* Reading of the old diff_custom array and transforming it to the new format.
* @param savegame is it read from the config or savegame. In the latter case
* we are sure there is an array; in the former case we have
* to check that.
*/
static void HandleOldDiffCustom(bool savegame)
{ {
uint options_to_load = GAME_DIFFICULTY_NUM - (CheckSavegameVersion(4) ? 1 : 0); uint options_to_load = GAME_DIFFICULTY_NUM - ((savegame && CheckSavegameVersion(4)) ? 1 : 0);
if (!savegame) {
/* If we did read to old_diff_custom, then at least one value must be non 0. */ /* If we did read to old_diff_custom, then at least one value must be non 0. */
bool old_diff_custom_used = false; bool old_diff_custom_used = false;
for (uint i = 0; i < options_to_load && !old_diff_custom_used; i++) { for (uint i = 0; i < options_to_load && !old_diff_custom_used; i++) {
@ -1809,10 +1819,11 @@ static void HandleOldDiffCustom()
} }
if (!old_diff_custom_used) return; if (!old_diff_custom_used) return;
}
for (uint i = 0; i < options_to_load; i++) { for (uint i = 0; i < options_to_load; i++) {
const SettingDesc *sd = &_patch_settings[i]; const SettingDesc *sd = &_patch_settings[i];
void *var = GetVariableAddress((_game_mode == GM_MENU) ? &_settings_newgame : &_settings, &sd->save); void *var = GetVariableAddress(savegame ? &_settings : &_settings_newgame, &sd->save);
Write_ValidateSetting(var, sd, (int32)((i == 4 ? 1000 : 1) * _old_diff_custom[i])); Write_ValidateSetting(var, sd, (int32)((i == 4 ? 1000 : 1) * _old_diff_custom[i]));
} }
} }
@ -1983,10 +1994,6 @@ static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc, SettingDescP
proc(ini, (const SettingDesc*)_win32_settings, "win32", NULL); proc(ini, (const SettingDesc*)_win32_settings, "win32", NULL);
#endif /* WIN32 */ #endif /* WIN32 */
PrepareOldDiffCustom();
proc(ini, _gameopt_settings, "gameopt", &_settings_newgame);
HandleOldDiffCustom();
proc(ini, _patch_settings, "patches", &_settings_newgame); proc(ini, _patch_settings, "patches", &_settings_newgame);
proc(ini, _currency_settings,"currency", &_custom_currency); proc(ini, _currency_settings,"currency", &_custom_currency);
@ -2002,6 +2009,11 @@ void LoadFromConfig()
{ {
IniFile *ini = ini_load(_config_file); IniFile *ini = ini_load(_config_file);
ResetCurrencies(false); // Initialize the array of curencies, without preserving the custom one ResetCurrencies(false); // Initialize the array of curencies, without preserving the custom one
PrepareOldDiffCustom();
ini_load_settings(ini, _gameopt_settings, "gameopt", &_settings_newgame);
HandleOldDiffCustom(false);
HandleSettingDescs(ini, ini_load_settings, ini_load_setting_list); HandleSettingDescs(ini, ini_load_settings, ini_load_setting_list);
_grfconfig_newgame = GRFLoadConfig(ini, "newgrf", false); _grfconfig_newgame = GRFLoadConfig(ini, "newgrf", false);
_grfconfig_static = GRFLoadConfig(ini, "newgrf-static", true); _grfconfig_static = GRFLoadConfig(ini, "newgrf-static", true);
@ -2247,7 +2259,7 @@ static void Load_OPTS()
* autosave-frequency stays when joining a network-server */ * autosave-frequency stays when joining a network-server */
PrepareOldDiffCustom(); PrepareOldDiffCustom();
LoadSettings(_gameopt_settings, &_settings); LoadSettings(_gameopt_settings, &_settings);
HandleOldDiffCustom(); HandleOldDiffCustom(true);
} }
static void Load_PATS() static void Load_PATS()