AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CTeamAiMgr: Collapse two loops into count_if 

Same behavior, less code.

Ranges in C++20 will allow us to further simplify this in the future.
This commit is contained in:
Lioncash 2020-05-02 22:09:27 -04:00
parent 748dbb8740
commit 21a33b01ad
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Runtime/World/CTeamAiMgr.cpp
View File

@ -1,5 +1,7 @@
#include "Runtime/World/CTeamAiMgr.hpp"
#include <algorithm>
#include "Runtime/CStateManager.hpp"
#include "Runtime/World/CPlayer.hpp"
@ -301,20 +303,15 @@ void CTeamAiMgr::ClearTeamAiRole(TUniqueId aiId) {
}
s32 CTeamAiMgr::GetNumAssignedOfRole(CTeamAiRole::ETeamAiRole testRole) const {
s32 ret = 0;
for (const auto& role : x58_roles)
if (role.GetTeamAiRole() == testRole)
++ret;
return ret;
return static_cast<s32>(std::count_if(x58_roles.cbegin(), x58_roles.cend(),
[testRole](const auto& role) { return role.GetTeamAiRole() == testRole; }));
}
s32 CTeamAiMgr::GetNumAssignedAiRoles() const {
s32 ret = 0;
for (const auto& role : x58_roles)
if (role.GetTeamAiRole() > CTeamAiRole::ETeamAiRole::Initial &&
role.GetTeamAiRole() <= CTeamAiRole::ETeamAiRole::Unassigned)
++ret;
return ret;
return static_cast<s32>(std::count_if(x58_roles.cbegin(), x58_roles.cend(), [](const auto& role) {
const auto aiRole = role.GetTeamAiRole();
return aiRole > CTeamAiRole::ETeamAiRole::Initial && aiRole <= CTeamAiRole::ETeamAiRole::Unassigned;
}));
}
CTeamAiRole* CTeamAiMgr::GetTeamAiRole(CStateManager& mgr, TUniqueId mgrId, TUniqueId aiId) {