Simplify std::count_if with std::ranges::count and projections

This commit is contained in:
mitaclaw
2024-09-29 15:07:08 -07:00
parent 62b2b939b5
commit 00e147c722
2 changed files with 5 additions and 14 deletions

View File

@ -2407,22 +2407,14 @@ bool NetPlayClient::IsFirstInGamePad(int ingame_pad) const
[](auto mapping) { return mapping > 0; });
}
static int CountLocalPads(const PadMappingArray& pad_map, const PlayerId& local_player_pid)
{
return static_cast<int>(
std::count_if(pad_map.begin(), pad_map.end(), [&local_player_pid](const auto& mapping) {
return mapping == local_player_pid;
}));
}
int NetPlayClient::NumLocalPads() const
{
return CountLocalPads(m_pad_map, m_local_player->pid);
return std::ranges::count(m_pad_map, m_local_player->pid);
}
int NetPlayClient::NumLocalWiimotes() const
{
return CountLocalPads(m_wiimote_map, m_local_player->pid);
return std::ranges::count(m_wiimote_map, m_local_player->pid);
}
static int InGameToLocal(int ingame_pad, const PadMappingArray& pad_map, PlayerId local_player_pid)