summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortruebrain <truebrain@openttd.org>2009-01-15 18:24:49 +0000
committertruebrain <truebrain@openttd.org>2009-01-15 18:24:49 +0000
commit6cfb9a24e0019481f5cd5324ec36c0889acfb8a1 (patch)
tree5d2f4d455592f406400577d41b3f62ead627da2c /src
parentef62688522218c50bed25bd8383e82365d91cdb0 (diff)
downloadopenttd-6cfb9a24e0019481f5cd5324ec36c0889acfb8a1.tar.xz
(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
Diffstat (limited to 'src')
-rw-r--r--src/ai/ai_scanner.cpp48
-rw-r--r--src/ai/ai_scanner.hpp6
2 files changed, 25 insertions, 29 deletions
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index bdf089a60..8e802cafc 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -166,8 +166,18 @@ AIScanner::~AIScanner()
{
AIInfoList::iterator it = this->info_list.begin();
for (; it != this->info_list.end(); it++) {
+ free((void *)(*it).first);
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;
}
@@ -308,30 +318,32 @@ void AIScanner::RegisterAI(AIInfo *info)
}
this->info_list[strdup(ai_name)] = info;
-}
-
-void AIScanner::UnregisterAI(AIInfo *info)
-{
- char ai_name[1024];
- snprintf(ai_name, sizeof(ai_name), "%s.%d", info->GetInstanceName(), info->GetVersion());
- this->info_list.erase(ai_name);
+ /* Add the AI to the 'unique' AI list, where only the highest version of the
+ * AI is registered. */
+ snprintf(ai_name, sizeof(ai_name), "%s", info->GetInstanceName());
+ strtolower(ai_name);
+ if (this->info_single_list.find(ai_name) == this->info_single_list.end()) {
+ 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()
{
- if (this->info_list.size() == 0) {
+ if (this->info_single_list.size() == 0) {
DEBUG(ai, 0, "No suitable AI found, loading 'dummy' AI.");
return this->info_dummy;
}
/* Find a random AI */
uint pos;
- if (_networking) pos = InteractiveRandomRange((uint16)this->info_list.size());
- else pos = RandomRange((uint16)this->info_list.size());
+ if (_networking) pos = InteractiveRandomRange((uint16)this->info_single_list.size());
+ else pos = RandomRange((uint16)this->info_single_list.size());
/* 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++;
AIInfoList::iterator first_it = it;
return (*it).second;
@@ -354,19 +366,7 @@ AIInfo *AIScanner::FindInfo(const char *nameParam, int versionParam)
strtolower(ai_name);
/* We want to load the latest version of this AI; so find it */
- 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);
-
- 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 (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, '.');
diff --git a/src/ai/ai_scanner.hpp b/src/ai/ai_scanner.hpp
index c974e14f7..3e82e4682 100644
--- a/src/ai/ai_scanner.hpp
+++ b/src/ai/ai_scanner.hpp
@@ -30,11 +30,6 @@ public:
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.
*/
class AIInfo *SelectRandomAI();
@@ -88,6 +83,7 @@ private:
AIInfo *info_dummy;
AIInfoList info_list;
+ AIInfoList info_single_list;
AILibraryList library_list;
class Squirrel *engine;
char main_script[1024];