summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2012-04-09 12:35:01 +0000
committerfrosch <frosch@openttd.org>2012-04-09 12:35:01 +0000
commitd7d89bc80610beae24ab24b7368f4c28e1ad1cda (patch)
tree373c6461df1c051390b18234330eea5c3412d9fc
parentc425368a17fa4e48b9aea187aaa96ddc9aaf7bf5 (diff)
downloadopenttd-d7d89bc80610beae24ab24b7368f4c28e1ad1cda.tar.xz
(svn r24108) -Fix [FS#5142]: When starting GS or AI, always use the settings of the game, not the new-game settings.
-rw-r--r--src/ai/ai_core.cpp4
-rw-r--r--src/ai/ai_instance.cpp2
-rw-r--r--src/game/game_core.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index ed2945cf3..82e2c7809 100644
--- 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. */
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index 6c71fef76..b1eb25b5a 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -222,7 +222,7 @@ void AIInstance::Died()
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);
diff --git a/src/game/game_core.cpp b/src/game/game_core.cpp
index add5c7fd8..c1892097f 100644
--- 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;