diff --git a/CInterface/Battling/BattleParty.cpp b/CInterface/Battling/BattleParty.cpp index dd40f29..e402dfc 100644 --- a/CInterface/Battling/BattleParty.cpp +++ b/CInterface/Battling/BattleParty.cpp @@ -19,3 +19,9 @@ export uint8_t CreatureLib_BattleParty_IsResponsibleForIndex(bool& out, const Ba } export bool CreatureLib_BattleParty_HasCreaturesNotInField(const BattleParty* p) { return p->HasCreaturesNotInField(); } + +inline bool BattleParty::IsResponsibleForIndex(uint8_t side, uint8_t index) const { + return std::any_of(_responsibleIndices.begin(), _responsibleIndices.end(), [side, index](const CreatureIndex& ci) { + return ci.GetSideIndex() == side && ci.GetCreatureIndex() == index; + }); +} diff --git a/src/Battling/Models/BattleParty.hpp b/src/Battling/Models/BattleParty.hpp index 8b84e62..e9033c9 100644 --- a/src/Battling/Models/BattleParty.hpp +++ b/src/Battling/Models/BattleParty.hpp @@ -24,13 +24,7 @@ namespace CreatureLib::Battling { return _responsibleIndices.Contains(index); } - inline bool IsResponsibleForIndex(uint8_t side, uint8_t index) const { - for (const auto& i : _responsibleIndices) { - if (i.GetSideIndex() == side && i.GetCreatureIndex() == index) - return true; - } - return false; - } + bool IsResponsibleForIndex(uint8_t side, uint8_t index) const; inline bool HasCreaturesNotInField() const { auto& p = _party->GetParty();