diff options
| author | QAston <qaston@gmail.com> | 2011-07-02 16:12:43 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-07-02 16:12:43 +0200 |
| commit | 1068583172141dcb1ca51a6b15fa2170ae094e97 (patch) | |
| tree | eea2c65e1458595c5b8f105d868c4f676f1ab286 /src/server/scripts/Outland | |
| parent | 86dde83ddade00c66a5af552d65d4787c22b6361 (diff) | |
| parent | f3dfa8066a291e144f53142d62b4e2f493e57137 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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<HostileReference *> 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<Unit* > 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); |
