cpp/openttd-patchpack/source Changeset - r24498:e9114d9ab04a

Changeset - r24498:e9114d9ab04a

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Patric Stout - 4 years ago 2020-12-25 14:22:40
truebrain@openttd.org

Fix #6468: don't store version of AIs-started-via-console in name

You can do: "startai myai.3", which starts version 3 of "myai".
This is very useful for testing save/load code between different
versions of your AI.

However, when using this syntax, the AI got saved as "myai.3" as
name of the AI, instead of "myai". This caused several problems,
like indicating to the user the AI could not be found, but still
load the AI. But in all cases, the AI never got the chance to
load the saved data, making the whole reason this exists pointless.

By splitting the name and version already in the console command,
the code becomes simpler and AIs started this way now follow the
normal flow after initialization.

3 files changed with 28 insertions and 23 deletions:

src/ai/ai_scanner.cpp

src/console_cmds.cpp

src/game/game_scanner.cpp

0 comments (0 inline, 0 general)

src/ai/ai_scanner.cpp

➞

Show inline comments

@@ @@ -101,20 +101,10 @@ AIInfo *AIScannerInfo::FindInfo(const ch @@
 	strecpy(ai_name, nameParam, lastof(ai_name));
 	strtolower(ai_name);
 	AIInfo *info = nullptr;
 	int version = -1;
 	if (versionParam == -1) {
 		/* We want to load the latest version of this AI; so find it */
 		if (this->info_single_list.find(ai_name) != this->info_single_list.end()) return static_cast<AIInfo *>(this->info_single_list[ai_name]);
 		/* If we didn't find a match AI, maybe the user included a version */
 		char *e = strrchr(ai_name, '.');
 		if (e == nullptr) return nullptr;
 		*e = '\0';
 		e++;
 		versionParam = atoi(e);
 		/* Continue, like we were calling this function with a version. */
 		return nullptr;
+	}
 	if (force_exact_match) {
@@ @@ -123,8 +113,12 @@ AIInfo *AIScannerInfo::FindInfo(const ch @@
 		seprintf(ai_name_tmp, lastof(ai_name_tmp), "%s.%d", ai_name, versionParam);
 		strtolower(ai_name_tmp);
 		if (this->info_list.find(ai_name_tmp) != this->info_list.end()) return static_cast<AIInfo *>(this->info_list[ai_name_tmp]);
 		return nullptr;
+	}
 	AIInfo *info = nullptr;
 	int version = -1;
 	/* See if there is a compatible AI which goes by that name, with the highest
 	 *  version which allows loading the requested version */
 	ScriptInfoList::iterator it = this->info_list.begin();

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -1172,7 +1172,24 @@ DEF_CONSOLE_CMD(ConStartAI) @@
 	AIConfig *config = AIConfig::GetConfig((CompanyID)n);
 	if (argc >= 2) {
 		config->Change(argv[1], -1, true);
 		config->Change(argv[1], -1, false);
 		/* If the name is not found, and there is a dot in the name,
 		 * try again with the assumption everything right of the dot is
 		 * the version the user wants to load. */
 		if (!config->HasScript()) {
 			char *name = stredup(argv[1]);
 			char *e = strrchr(name, '.');
 			if (e != nullptr) {
 				*e = '\0';
 				e++;
 				int version = atoi(e);
 				config->Change(name, version, true);
+			}
 			free(name);
+		}
 		if (!config->HasScript()) {
 			IConsoleWarning("Failed to load the specified AI");
 			return true;

src/game/game_scanner.cpp

➞

Show inline comments

@@ @@ -40,20 +40,10 @@ GameInfo *GameScannerInfo::FindInfo(cons @@
 	strecpy(game_name, nameParam, lastof(game_name));
 	strtolower(game_name);
 	GameInfo *info = nullptr;
 	int version = -1;
 	if (versionParam == -1) {
 		/* We want to load the latest version of this Game script; so find it */
 		if (this->info_single_list.find(game_name) != this->info_single_list.end()) return static_cast<GameInfo *>(this->info_single_list[game_name]);
 		/* If we didn't find a match Game script, maybe the user included a version */
 		char *e = strrchr(game_name, '.');
 		if (e == nullptr) return nullptr;
 		*e = '\0';
 		e++;
 		versionParam = atoi(e);
 		/* Continue like we were calling this function with a version. */
 		return nullptr;
+	}
 	if (force_exact_match) {
@@ @@ -62,8 +52,12 @@ GameInfo *GameScannerInfo::FindInfo(cons @@
 		seprintf(game_name_tmp, lastof(game_name_tmp), "%s.%d", game_name, versionParam);
 		strtolower(game_name_tmp);
 		if (this->info_list.find(game_name_tmp) != this->info_list.end()) return static_cast<GameInfo *>(this->info_list[game_name_tmp]);
 		return nullptr;
+	}
 	GameInfo *info = nullptr;
 	int version = -1;
 	/* See if there is a compatible Game script which goes by that name, with the highest
 	 *  version which allows loading the requested version */
 	ScriptInfoList::iterator it = this->info_list.begin();

0 comments (0 inline, 0 general)