miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ff08a22: script configs were cleared by AIPL and GSDT chunks from intro game (#14910)

Browse Source
This commit is contained in:
Loïc Guilloux
2025-12-14 17:07:19 +01:00
committed by dP
parent a482863544
commit c681ad21fb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/ai_config.cpp
View File

@@ -21,7 +21,7 @@
{ {
assert(company < MAX_COMPANIES); 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) { if (source == SSS_DEFAULT) {
Company *c = Company::GetIfValid(company); Company *c = Company::GetIfValid(company);

2
src/game/game_config.cpp
View File

@@ -17,7 +17,7 @@
/* static */ GameConfig *GameConfig::GetConfig(ScriptSettingSource source) /* 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; auto &config = (source == SSS_FORCE_NEWGAME) ? _settings_newgame.script_config.game : _settings_game.script_config.game;
if (config == nullptr) config = std::make_unique<GameConfig>(); if (config == nullptr) config = std::make_unique<GameConfig>();