From 00db1e6b22c719e4801b1a958bf1931983d40186 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 19 Mar 2018 17:29:13 -0300 Subject: [PATCH] Core/Creatures: Minor HasSpell method cleanup Cherry-picked improved from 5734788c0277d7f342d534dca63db0ce4e862bc5 --- src/server/game/Entities/Creature/Creature.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index ec1934d550..a61f554dc7 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2391,11 +2391,7 @@ void Creature::SetInCombatWithZone() bool Creature::HasSpell(uint32 spellID) const { - uint8 i; - for (i = 0; i < MAX_CREATURE_SPELLS; ++i) - if (spellID == m_spells[i]) - break; - return i < MAX_CREATURE_SPELLS; //broke before end of iteration of known spells + return std::find(std::begin(m_spells), std::end(m_spells), spellID) != std::end(m_spells); } time_t Creature::GetRespawnTimeEx() const