diff options
| author | Spp <spp@jorge.gr> | 2012-03-07 14:08:30 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-03-07 14:09:18 +0100 |
| commit | f495e0efe4aff18d702fdc74ecc4f43e249aea9a (patch) | |
| tree | fd53845273354fb46fb33d8228479d72352aa5a5 /src/server/scripts/EasternKingdoms/ZulAman | |
| parent | e5d23103f37c40d2e946fa0e2db66d2f527ad9af (diff) | |
Warning fixes and some random cleanup here and there
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ZulAman')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index dd2bef556c4..8bbcdd6c036 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -226,7 +226,7 @@ class boss_janalai : public CreatureScript BombCount = 0; } - bool HatchAllEggs(uint32 uiAction) //1: reset, 2: isHatching all + bool HatchAllEggs(uint32 action) //1: reset, 2: isHatching all { std::list<Creature*> templist; float x, y, z; @@ -251,9 +251,9 @@ class boss_janalai : public CreatureScript for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) { - if (uiAction == 1) + if (action == 1) (*i)->SetDisplayId(10056); - else if (uiAction == 2 &&(*i)->GetDisplayId() != 11686) + else if (action == 2 &&(*i)->GetDisplayId() != 11686) (*i)->CastSpell(*i, SPELL_HATCH_EGG, false); } return true; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index bf951dd186c..df90f80db4c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -157,10 +157,10 @@ class npc_zulaman_hostage : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) + if (action == GOSSIP_ACTION_INFO_DEF + 1) player->CLOSE_GOSSIP_MENU(); if (!creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) |