From 7b69a0b7fa5a511ef24dc91706d138caed8b5e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Sun, 14 Dec 2025 17:07:19 +0100 Subject: [PATCH] Fix ff08a22: script configs were cleared by AIPL and GSDT chunks from intro game (#14910) --- src/ai/ai_config.cpp | 2 +- src/game/game_config.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ai/ai_config.cpp b/src/ai/ai_config.cpp index 9fc94af387..343bf81e32 100644 --- a/src/ai/ai_config.cpp +++ b/src/ai/ai_config.cpp @@ -21,7 +21,7 @@ { assert(company < MAX_COMPANIES); - if (_game_mode == GM_MENU) source = SSS_FORCE_NEWGAME; + if (source == SSS_DEFAULT && _game_mode == GM_MENU) source = SSS_FORCE_NEWGAME; if (source == SSS_DEFAULT) { Company *c = Company::GetIfValid(company); diff --git a/src/game/game_config.cpp b/src/game/game_config.cpp index 0085e6a8e5..231d1a7c4a 100644 --- a/src/game/game_config.cpp +++ b/src/game/game_config.cpp @@ -17,7 +17,7 @@ /* static */ GameConfig *GameConfig::GetConfig(ScriptSettingSource source) { - if (_game_mode == GM_MENU) source = SSS_FORCE_NEWGAME; + if (source == SSS_DEFAULT && _game_mode == GM_MENU) source = SSS_FORCE_NEWGAME; auto &config = (source == SSS_FORCE_NEWGAME) ? _settings_newgame.script_config.game : _settings_game.script_config.game; if (config == nullptr) config = std::make_unique();