dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename gameopt_settings to old_gameopt_settings

Browse Source 
To match upstream
This commit is contained in:
Jonathan G Rennison
2023-11-17 19:53:24 +00:00
parent cf4cf5c08f
commit 4187b8cc62
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings.cpp
View File

@@ -2502,7 +2502,7 @@ void LoadFromConfig(bool startup)
GameLoadConfig(generic_ini, "game_scripts");
PrepareOldDiffCustom();
IniLoadSettings(generic_ini, _gameopt_settings, "gameopt", &_settings_newgame, false);
IniLoadSettings(generic_ini, _old_gameopt_settings, "gameopt", &_settings_newgame, false);
HandleOldDiffCustom(false);
ValidateSettings();
@@ -3531,7 +3531,7 @@ static void Load_OPTS()
* a networking environment. This ensures for example that the local
* autosave-frequency stays when joining a network-server */
PrepareOldDiffCustom();
LoadSettings(_gameopt_settings, &_settings_game);
LoadSettings(_old_gameopt_settings, &_settings_game);
HandleOldDiffCustom(true);
}