From 44de4a0799725f159e828b65e6ddef30dc423bb4 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Fri, 5 Jun 2020 14:15:20 +0200 Subject: [PATCH] Use std::algorithm for Battle::CreatureInField --- src/Battling/Models/Battle.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Battling/Models/Battle.cpp b/src/Battling/Models/Battle.cpp index d7fa0d3..95d02ce 100644 --- a/src/Battling/Models/Battle.cpp +++ b/src/Battling/Models/Battle.cpp @@ -75,11 +75,7 @@ BattleRandom* Battle::GetRandom() noexcept { return &_random; } bool Battle::CreatureInField(ArbUt::BorrowedPtr creature) const { AssertNotNull(creature) - for (auto s : _sides) { - if (s->CreatureOnSide(creature)) - return true; - } - return false; + return std::any_of(_sides.begin(), _sides.end(), [creature](auto c) { return c->CreatureOnSide(creature); }); } void Battle::ForceRecall(uint8_t side, uint8_t index) { _sides[side]->SetCreature(nullptr, index); }