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

Split save/load settings into separate INI files

Browse Source 
Matching upstream for all settings
This commit is contained in:
Jonathan G Rennison
2023-11-18 19:26:08 +00:00
parent ccfdf626ad
commit 6e671ed6e2
23 changed files with 4406 additions and 4089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/saveload/settings_sl.cpp
View File

@@ -21,8 +21,6 @@
#include "../safeguards.h"
const SettingTable &GetSettingsTableInternal();
namespace upstream_sl {
/**
@@ -34,7 +32,7 @@ namespace upstream_sl {
static std::vector<SaveLoad> GetSettingsDesc(bool is_loading)
{
std::vector<SaveLoad> saveloads;
for (auto &sd : GetSettingsTableInternal()) {
for (auto &sd : IterateSettingTables(GetSaveLoadSettingsTables())) {
if (sd->flags & SF_NOT_IN_SAVE) continue;
if (is_loading && !SlXvIsFeaturePresent(XSLFI_TABLE_PATS) && (sd->flags & SF_PATCH)) continue;
if (!sd->save.ext_feature_test.IsFeaturePresent(_sl_version, sd->save.version_from, sd->save.version_to)) continue;
@@ -170,7 +168,7 @@ static void LoadSettings(void *object, const SaveLoadCompatTable &slct)
if (!IsSavegameVersionBefore(SLV_RIFF_TO_ARRAY) && SlIterateArray() != -1) SlErrorCorrupt("Too many settings entries");
/* Ensure all IntSettings are valid (min/max could have changed between versions etc). */
for (auto &sd : GetSettingsTableInternal()) {
for (auto &sd : IterateSettingTables(GetSaveLoadSettingsTables())) {
if (sd->flags & SF_NOT_IN_SAVE) continue;
if ((sd->flags & SF_NO_NETWORK_SYNC) && _networking && !_network_server) continue;
if (!sd->save.ext_feature_test.IsFeaturePresent(_sl_xv_feature_static_versions, MAX_LOAD_SAVEGAME_VERSION, sd->save.version_from, sd->save.version_to)) continue;