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

Codechange: Use range filter to simplify picking a random AI. (#13897)

pull/13939/head
Peter Nelson 2025-03-31 20:32:16 +01:00 committed by GitHub
parent f719fa678f
commit 6a3d17923b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ai/ai_scanner.cpp
View File

@ -8,6 +8,7 @@
/** @file ai_scanner.cpp allows scanning AI scripts */ /** @file ai_scanner.cpp allows scanning AI scripts */
#include "../stdafx.h" #include "../stdafx.h"
#include <ranges>
#include "../debug.h" #include "../debug.h"
#include "../network/network.h" #include "../network/network.h"
#include "../openttd.h" #include "../openttd.h"
@ -65,31 +66,21 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
return this->info_dummy; return this->info_dummy;
} }
uint num_random_ais = 0; /* Filter for AIs suitable as Random AI. */
for (const auto &item : info_single_list) { auto random_ais = info_single_list | std::views::filter([](const auto &item) { return static_cast<AIInfo *>(item.second)->UseAsRandomAI(); });
AIInfo *i = static_cast<AIInfo *>(item.second);
if (i->UseAsRandomAI()) num_random_ais++;
}
uint num_random_ais = std::ranges::distance(random_ais);
if (num_random_ais == 0) { if (num_random_ais == 0) {
Debug(script, 0, "No suitable AI found, loading 'dummy' AI."); Debug(script, 0, "No suitable AI found, loading 'dummy' AI.");
return this->info_dummy; return this->info_dummy;
} }
/* Find a random AI */ /* Pick a random AI */
uint pos = ScriptObject::GetRandomizer(OWNER_NONE).Next(num_random_ais); uint pos = ScriptObject::GetRandomizer(OWNER_NONE).Next(num_random_ais);
auto it = std::ranges::next(std::begin(random_ais), pos, std::end(random_ais));
assert(it != std::end(random_ais));
/* Find the Nth item from the array */ return static_cast<AIInfo *>(it->second);
ScriptInfoList::const_iterator it = this->info_single_list.begin();
#define GetAIInfo(it) static_cast<AIInfo *>((*it).second)
while (!GetAIInfo(it)->UseAsRandomAI()) it++;
for (; pos > 0; pos--) {
it++;
while (!GetAIInfo(it)->UseAsRandomAI()) it++;
}
return GetAIInfo(it);
#undef GetAIInfo
} }
AIInfo *AIScannerInfo::FindInfo(const std::string &name, int version, bool force_exact_match) AIInfo *AIScannerInfo::FindInfo(const std::string &name, int version, bool force_exact_match)