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/Kalimdor | |
| 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/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/silithus.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 5b6dc784113..ee7ef383603 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -222,11 +222,9 @@ public: ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1); if (msg == EQUIP_ERR_OK) - { - Item* item = player->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true); - if (item && player) + if (Item* item = player->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true)) player->SendNewItem(item, 1, true, false, true); - } + player->SEND_GOSSIP_MENU(907, creature->GetGUID()); } return true; diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 639de3dc3b2..bad278f51c7 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -537,7 +537,6 @@ public: if (!Fandral || !Arygos || !Caelestrasz || !Merithra) return; - Unit* mob = NULL; AnimationTimer = EventAnim[AnimationCount].Timer; if (eventEnd == false) { @@ -720,6 +719,7 @@ public: case 51: { uint32 entries[4] = { 15423, 15424, 15414, 15422 }; + Unit* mob = NULL; for (uint8 i = 0; i < 4; ++i) { mob = player->FindNearestCreature(entries[i], 50, me); @@ -844,9 +844,6 @@ public: void UpdateAI(const uint32 diff) { - Unit* target = NULL; - //Player* player = me->GetPlayer(PlayerGUID); - if (!Timers) { if (me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) //all but Kaldorei Soldiers @@ -890,6 +887,7 @@ public: } if (!hasTarget) { + Unit* target = NULL; if (me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) target = me->FindNearestCreature(15423, 20, true); if (me->GetEntry() == 15423) |