From bb921ae78c365b608b604f820ba7292b786637aa Mon Sep 17 00:00:00 2001 From: Spp- Date: Fri, 1 Jul 2011 14:58:44 +0200 Subject: Core: Do not use STL container size method to check if container is empty --- src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp | 2 +- src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp | 2 +- .../scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp | 2 +- src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp | 2 +- src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp | 2 +- src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp | 2 +- src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index b380d559ae0..adde1d9bf4a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -286,7 +286,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) target_list.push_back(pTarget); pTarget = NULL; } - if (target_list.size()) + if (!target_list.empty()) pTarget = *(target_list.begin()+rand()%target_list.size()); DoCast(pTarget, SPELL_BERSERKER_CHARGE); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 788c9fb171a..daad47b6106 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -312,7 +312,7 @@ public: std::list t_list = me->getThreatManager().getThreatList(); std::vector targets; - if (!t_list.size()) + if (t_list.empty()) return; //begin + 1, so we don't target the one with the highest threat diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 1fdd23fe51d..cf785a64301 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -525,7 +525,7 @@ public: me->IsWithinDistInMap(i->getSource(), range) && i->getSource()->isAlive()) temp.push_back(i->getSource()); - if (temp.size()) + if (!temp.empty()) { j = temp.begin(); advance(j, rand()%temp.size()); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index c1f80fb50af..2b93d4a6d57 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -247,7 +247,7 @@ class boss_janalai : public CreatureScript } //sLog->outError("Eggs %d at middle", templist.size()); - if (!templist.size()) + if (templist.empty()) return false; for (std::list::const_iterator i = templist.begin(); i != templist.end(); ++i) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 3a6ccacf753..ab4cb968336 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -175,7 +175,7 @@ class boss_nalorakk : public CreatureScript cell.Visit(pair, cSearcher, *(me->GetMap())); } - if (!templist.size()) + if (templist.empty()) return; for (std::list::const_iterator i = templist.begin(); i != templist.end(); ++i) diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 5ebe89ffea9..b958243e5ec 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -144,7 +144,7 @@ public: // Get the Threat List std::list m_threatlist = me->getThreatManager().getThreatList(); - if (!m_threatlist.size()) // He doesn't have anyone in his threatlist, useless to continue + if (m_threatlist.empty()) // He doesn't have anyone in his threatlist, useless to continue return; std::list targets; diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index c175c0baa8c..dc44a455c34 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -776,7 +776,7 @@ public: target_list.push_back(pTarget); pTarget = NULL; } - if (target_list.size()) + if (!target_list.empty()) pTarget = *(target_list.begin()+rand()%target_list.size()); me->InterruptNonMeleeSpells(false); -- cgit v1.2.3