mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15096) -Fix [NoAI]: free memory when no longer needed 

-Fix [NoAI]: when there are multiple versions of one AI, never randonly pick an older one, but always the latest
release/0.7
truebrain 2009-01-15 18:24:49 +00:00
parent ef62688522
commit 6cfb9a24e0
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/ai/ai_scanner.cpp
View File

@ -166,8 +166,18 @@ AIScanner::~AIScanner()
{ {
AIInfoList::iterator it = this->info_list.begin(); AIInfoList::iterator it = this->info_list.begin();
for (; it != this->info_list.end(); it++) { for (; it != this->info_list.end(); it++) {
free((void *)(*it).first);
delete (*it).second; delete (*it).second;
} }
it = this->info_single_list.begin();
for (; it != this->info_single_list.end(); it++) {
free((void *)(*it).first);
}
AILibraryList::iterator lit = this->library_list.begin();
for (; lit != this->library_list.end(); lit++) {
free((void *)(*lit).first);
delete (*lit).second;
}
delete this->engine; delete this->engine;
} }
@ -308,30 +318,32 @@ void AIScanner::RegisterAI(AIInfo *info)
} }
this->info_list[strdup(ai_name)] = info; this->info_list[strdup(ai_name)] = info;
}
void AIScanner::UnregisterAI(AIInfo *info) /* Add the AI to the 'unique' AI list, where only the highest version of the
{ * AI is registered. */
char ai_name[1024]; snprintf(ai_name, sizeof(ai_name), "%s", info->GetInstanceName());
snprintf(ai_name, sizeof(ai_name), "%s.%d", info->GetInstanceName(), info->GetVersion()); strtolower(ai_name);
if (this->info_single_list.find(ai_name) == this->info_single_list.end()) {
this->info_list.erase(ai_name); this->info_single_list[strdup(ai_name)] = info;
} else if (this->info_single_list[strdup(ai_name)]->GetVersion() < info->GetVersion()) {
this->info_single_list[ai_name] = info;
}
} }
AIInfo *AIScanner::SelectRandomAI() AIInfo *AIScanner::SelectRandomAI()
{ {
if (this->info_list.size() == 0) { if (this->info_single_list.size() == 0) {
DEBUG(ai, 0, "No suitable AI found, loading 'dummy' AI."); DEBUG(ai, 0, "No suitable AI found, loading 'dummy' AI.");
return this->info_dummy; return this->info_dummy;
} }
/* Find a random AI */ /* Find a random AI */
uint pos; uint pos;
if (_networking) pos = InteractiveRandomRange((uint16)this->info_list.size()); if (_networking) pos = InteractiveRandomRange((uint16)this->info_single_list.size());
else pos = RandomRange((uint16)this->info_list.size()); else pos = RandomRange((uint16)this->info_single_list.size());
/* Find the Nth item from the array */ /* Find the Nth item from the array */
AIInfoList::iterator it = this->info_list.begin(); AIInfoList::iterator it = this->info_single_list.begin();
for (; pos > 0; pos--) it++; for (; pos > 0; pos--) it++;
AIInfoList::iterator first_it = it; AIInfoList::iterator first_it = it;
return (*it).second; return (*it).second;
@ -354,19 +366,7 @@ AIInfo *AIScanner::FindInfo(const char *nameParam, int versionParam)
strtolower(ai_name); strtolower(ai_name);
/* We want to load the latest version of this AI; so find it */ /* We want to load the latest version of this AI; so find it */
AIInfoList::iterator it = this->info_list.begin(); if (this->info_single_list.find(ai_name) != this->info_single_list.end()) return this->info_single_list[ai_name];
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);
if (strcasecmp(ai_name, ai_name_compare) == 0 && (*it).second->GetVersion() > version) {
version = (*it).second->GetVersion();
info = (*it).second;
}
}
if (info != NULL) return info;
/* If we didn't find a match AI, maybe the user included a version */ /* If we didn't find a match AI, maybe the user included a version */
char *e = strrchr(name, '.'); char *e = strrchr(name, '.');

6
src/ai/ai_scanner.hpp
View File

@ -29,11 +29,6 @@ public:
void SetDummyAI(class AIInfo *info) { this->info_dummy = info; } void SetDummyAI(class AIInfo *info) { this->info_dummy = info; }
/**
* Remove an AI from the available list.
*/
void UnregisterAI(class AIInfo *info);
/** /**
* Select a Random AI. * Select a Random AI.
*/ */
@ -88,6 +83,7 @@ private:
AIInfo *info_dummy; AIInfo *info_dummy;
AIInfoList info_list; AIInfoList info_list;
AIInfoList info_single_list;
AILibraryList library_list; AILibraryList library_list;
class Squirrel *engine; class Squirrel *engine;
char main_script[1024]; char main_script[1024];