From 4187b8cc6225f604d5870f5014ea763d57a6c72c Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Fri, 17 Nov 2023 19:53:24 +0000 Subject: [PATCH] Rename gameopt_settings to old_gameopt_settings To match upstream --- src/settings.cpp | 4 ++-- src/table/settings/CMakeLists.txt | 2 +- .../{gameopt_settings.ini => old_gameopt_settings.ini} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/table/settings/{gameopt_settings.ini => old_gameopt_settings.ini} (99%) diff --git a/src/settings.cpp b/src/settings.cpp index 7204864884..6e0c38bd64 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -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); } diff --git a/src/table/settings/CMakeLists.txt b/src/table/settings/CMakeLists.txt index cb04bc0bf4..854dccea55 100644 --- a/src/table/settings/CMakeLists.txt +++ b/src/table/settings/CMakeLists.txt @@ -4,7 +4,6 @@ set(TABLE_BINARY_DIR ${GENERATED_BINARY_DIR}/table) set(TABLE_INI_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/company_settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/currency_settings.ini - ${CMAKE_CURRENT_SOURCE_DIR}/gameopt_settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/gui_settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/misc_settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/multimedia_settings.ini @@ -12,6 +11,7 @@ set(TABLE_INI_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/network_private_settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/network_secrets_settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/news_display_settings.ini + ${CMAKE_CURRENT_SOURCE_DIR}/old_gameopt_settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/scenario_settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/settings.ini ${CMAKE_CURRENT_SOURCE_DIR}/win32_settings.ini diff --git a/src/table/settings/gameopt_settings.ini b/src/table/settings/old_gameopt_settings.ini similarity index 99% rename from src/table/settings/gameopt_settings.ini rename to src/table/settings/old_gameopt_settings.ini index 12c61beb3f..2914c3b213 100644 --- a/src/table/settings/gameopt_settings.ini +++ b/src/table/settings/old_gameopt_settings.ini @@ -30,7 +30,7 @@ static constexpr std::initializer_list _climates{"temperate", "arct static constexpr std::initializer_list _roadsides{"left", "right"}; static constexpr std::initializer_list _settings_profiles{"easy", "medium", "hard"}; -static const SettingTable _gameopt_settings{ +static const SettingTable _old_gameopt_settings{ /* In version 4 a new difficulty setting has been added to the difficulty settings, * town attitude towards demolishing. Needs special handling because some dimwit thought * it funny to have the GameDifficulty struct be an array while it is a struct of