From d7d89bc80610beae24ab24b7368f4c28e1ad1cda Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Mon, 9 Apr 2012 12:35:01 +0000
Subject: [PATCH] (svn r24108) -Fix [FS#5142]: When starting GS or AI, always
 use the settings of the game, not the new-game settings.

---
 src/ai/ai_core.cpp     | 4 ++--
 src/ai/ai_instance.cpp | 2 +-
 src/game/game_core.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index ed2945cf3b..82e2c78096 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 6c71fef768..b1eb25b5a6 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 add5c7fd83..c1892097fc 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;