diff options
author | Nay <dnpd.dd@gmail.com> | 2012-08-30 22:44:03 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-08-30 22:44:03 +0100 |
commit | abbb896cfb73017cf1c313d597984a9ce0a9dcab (patch) | |
tree | 58cd6165976448c3cdec18c4e4c6381c6bfba936 /src/server/scripts/Outland | |
parent | 5f1977cb1d690d2e60a1f5355244ec472e014278 (diff) |
Core: Fix many "errors"/warnings and coding style (2)
Scripts; also reverted a change to AuthSocket
Errors were found using Cppcheck, open-source static analysis tool
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r-- | src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp | 4 | ||||
-rw-r--r-- | src/server/scripts/Outland/BlackTemple/illidari_council.cpp | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 1b2fe61e87c..ec25a8f9f60 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -248,11 +248,9 @@ public: { for (uint8 i = 0; i < 3; ++i) { - Unit* unit = NULL; if (TargetGUID[i]) { - unit = Unit::GetUnit(*me, TargetGUID[i]); - if (unit) + if (Unit* unit = Unit::GetUnit(*me, TargetGUID[i])) unit->CastSpell(unit, SPELL_ATTRACTION, true); TargetGUID[i] = 0; } diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 710f5c82fab..673d4bcc96f 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -299,12 +299,11 @@ public: for (uint8 i = 0; i < 4; ++i) { - Unit* Member = NULL; if (Council[i]) { - Member = Unit::GetUnit(*me, Council[i]); - if (Member && Member->isAlive()) - CAST_CRE(Member)->AI()->AttackStart(target); + Unit* member = Unit::GetUnit(*me, Council[i]); + if (member && member->isAlive()) + CAST_CRE(member)->AI()->AttackStart(target); } } |