diff options
Diffstat (limited to 'sim/src/TeamManager.cpp')
| -rw-r--r-- | sim/src/TeamManager.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sim/src/TeamManager.cpp b/sim/src/TeamManager.cpp index 2dc3196..b792297 100644 --- a/sim/src/TeamManager.cpp +++ b/sim/src/TeamManager.cpp @@ -1,9 +1,9 @@ #include "TeamManager.h" #include <algorithm> +#include <numeric> #include <random> #include <utility> -#include <vector> #include <entt/entity/registry.hpp> @@ -38,13 +38,19 @@ TeamManager::get(int team) const entt::entity -TeamManager::random(int team) +TeamManager::random(const int exclude) { - auto& members = teams.at(team); - if (members.size() == 0) + std::vector<int> open; + open.resize(teams.size()); + std::iota(open.begin(), open.end(), 0); + auto is_closed = [&](const int team){ return team == exclude || teams.at(team).empty(); }; + open.erase(std::remove_if(open.begin(), open.end(), is_closed), open.end()); + if (open.empty()) return entt::null; - std::uniform_int_distribution<Team::size_type> uniform{0, members.size() - 1}; - return members.at(uniform(generator)); + std::uniform_int_distribution<Team::size_type> team{0, open.size() - 1}; + const auto& members = teams.at(open.at(team(generator))); + std::uniform_int_distribution<Team::size_type> member{0, members.size() - 1}; + return members.at(member(generator)); } |