cpp/openttd-patchpack/source Changeset - r10774:95163043f047

Changeset - r10774:95163043f047

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

truebrain - 15 years ago 2009-01-16 14:56:13
truebrain@openttd.org

(svn r15107) -Fix [NoAI]: don't use so much explicit string copies if it is not required

1 file changed with 7 insertions and 11 deletions:

src/ai/ai_scanner.cpp

0 comments (0 inline, 0 general)

src/ai/ai_scanner.cpp

➞

Show inline comments

@@ @@ -352,43 +352,39 @@ AIInfo *AIScanner::SelectRandomAI() @@
 AIInfo *AIScanner::FindInfo(const char *nameParam, int versionParam)
+{
 	if (this->info_list.size() == 0) return NULL;
 	if (nameParam == NULL) return NULL;
 	char ai_name[1024];
 	char name[1024];
 	ttd_strlcpy(name, nameParam, sizeof(name));
 	ttd_strlcpy(ai_name, nameParam, sizeof(ai_name));
 	strtolower(ai_name);
 	AIInfo *info = NULL;
 	int version = -1;
 	if (versionParam == -1) {
 		snprintf(ai_name, sizeof(ai_name), "%s", name);
 		strtolower(ai_name);
 		/* 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 this->info_single_list[ai_name];
 		/* If we didn't find a match AI, maybe the user included a version */
-		char *e = strrchr(name, '.');
+		char *e = strrchr(ai_name, '.');
 		if (e == NULL) return NULL;
 		*e = '\0';
 		e++;
 		versionParam = atoi(e);
 		/* Fall-through, like we were calling this function with a version */
+	}
 	/* Try to find a direct 'name.version' match */
 	snprintf(ai_name, sizeof(ai_name), "%s.%d", name, versionParam);
 	strtolower(ai_name);
 	if (this->info_list.find(ai_name) != this->info_list.end()) return this->info_list[ai_name];
 	char ai_name_tmp[1024];
 	snprintf(ai_name_tmp, sizeof(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 this->info_list[ai_name_tmp];
 	/* See if there is a compatible AI which goes by that name, with the highest
 	 *  version which allows loading the requested version */
 	snprintf(ai_name, sizeof(ai_name), "%s", name);
 	strtolower(ai_name);
 	AIInfoList::iterator it = this->info_list.begin();
 	for (; it != this->info_list.end(); it++) {
 		char ai_name_compare[1024];
 		snprintf(ai_name_compare, sizeof(ai_name_compare), "%s", (*it).second->GetInstanceName());
 		strtolower(ai_name_compare);

0 comments (0 inline, 0 general)