Mercurial > hg > openttd
changeset 19223:f7ca51a69f28 draft
(svn r24108) -Fix [FS#5142]: When starting GS or AI, always use the settings of the game, not the new-game settings.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Mon, 09 Apr 2012 12:35:01 +0000 |
| parents | 77f06fb78563 |
| children | 9bb2cce59004 |
| files | src/ai/ai_core.cpp src/ai/ai_instance.cpp src/game/game_core.cpp |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -39,7 +39,7 @@ /* Clients shouldn't start AIs */ if (_networking && !_network_server) return; - AIConfig *config = AIConfig::GetConfig(company); + AIConfig *config = AIConfig::GetConfig(company, AIConfig::SSS_FORCE_GAME); AIInfo *info = config->GetInfo(); if (info == NULL || (rerandomise_ai && config->IsRandom())) { info = AI::scanner_info->SelectRandomAI(); @@ -283,7 +283,7 @@ { /* Find the first company which doesn't exist yet */ for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) { - if (!Company::IsValidID(c)) return AIConfig::GetConfig(c)->GetSetting("start_date"); + if (!Company::IsValidID(c)) return AIConfig::GetConfig(c, AIConfig::SSS_FORCE_GAME)->GetSetting("start_date"); } /* Currently no AI can be started, check again in a year. */
--- a/src/ai/ai_instance.cpp +++ b/src/ai/ai_instance.cpp @@ -222,7 +222,7 @@ ShowAIDebugWindow(_current_company); - const AIInfo *info = AIConfig::GetConfig(_current_company)->GetInfo(); + const AIInfo *info = AIConfig::GetConfig(_current_company, AIConfig::SSS_FORCE_GAME)->GetInfo(); if (info != NULL) { ShowErrorMessage(STR_ERROR_AI_PLEASE_REPORT_CRASH, INVALID_STRING_ID, WL_WARNING);
--- a/src/game/game_core.cpp +++ b/src/game/game_core.cpp @@ -72,7 +72,7 @@ /* Clients shouldn't start GameScripts */ if (_networking && !_network_server) return; - GameConfig *config = GameConfig::GetConfig(); + GameConfig *config = GameConfig::GetConfig(GameConfig::SSS_FORCE_GAME); GameInfo *info = config->GetInfo(); if (info == NULL) return;