diff options
| author | click <click@gonnamakeyou.com> | 2011-07-02 22:18:03 +0200 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2011-07-02 22:18:03 +0200 |
| commit | f91ee24184dffcd686d60dd07a1d19da3f5da818 (patch) | |
| tree | 83d06dd9c18ca0d69c35e0937c14bdd83c3c98d9 /src/server/scripts/EasternKingdoms/ZulAman | |
| parent | 3ddc1cc4c40b757dd42b781552b483a047a6df64 (diff) | |
Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ZulAman')
4 files changed, 29 insertions, 29 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 495365067e9..06fc731b4ba 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -370,12 +370,12 @@ class boss_akilzon : public CreatureScript if (z > 95) z = 95.0f - urand(0, 5); } - Creature* pCreature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - if (pCreature) + Creature* creature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + if (creature) { - pCreature->AddThreat(me->getVictim(), 1.0f); - pCreature->AI()->AttackStart(me->getVictim()); - BirdGUIDs[i] = pCreature->GetGUID(); + creature->AddThreat(me->getVictim(), 1.0f); + creature->AI()->AttackStart(me->getVictim()); + BirdGUIDs[i] = creature->GetGUID(); } } } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 3f574f5da43..eabbab45a6d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -325,18 +325,18 @@ class boss_hexlord_malacrass : public CreatureScript { for (uint8 i = 0; i < 4; ++i) { - Creature* pCreature = (Unit::GetCreature((*me), AddGUID[i])); - if (!pCreature || !pCreature->isAlive()) + Creature* creature = (Unit::GetCreature((*me), AddGUID[i])); + if (!creature || !creature->isAlive()) { - if (pCreature) pCreature->setDeathState(DEAD); - pCreature = me->SummonCreature(AddEntry[i], Pos_X[i], POS_Y, POS_Z, ORIENT, TEMPSUMMON_DEAD_DESPAWN, 0); - if (pCreature) AddGUID[i] = pCreature->GetGUID(); + if (creature) creature->setDeathState(DEAD); + creature = me->SummonCreature(AddEntry[i], Pos_X[i], POS_Y, POS_Z, ORIENT, TEMPSUMMON_DEAD_DESPAWN, 0); + if (creature) AddGUID[i] = creature->GetGUID(); } else { - pCreature->AI()->EnterEvadeMode(); - pCreature->GetMap()->CreatureRelocation(me, Pos_X[i], POS_Y, POS_Z, ORIENT); - pCreature->StopMoving(); + creature->AI()->EnterEvadeMode(); + creature->GetMap()->CreatureRelocation(me, Pos_X[i], POS_Y, POS_Z, ORIENT); + creature->StopMoving(); } } } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index b2746305366..f6cba9fea79 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -296,16 +296,16 @@ class boss_zuljin : public CreatureScript void SpawnAdds() { - Creature* pCreature = NULL; + Creature* creature = NULL; for (uint8 i = 0; i < 4; ++i) { - pCreature = me->SummonCreature(SpiritInfo[i].entry, SpiritInfo[i].x, SpiritInfo[i].y, SpiritInfo[i].z, SpiritInfo[i].orient, TEMPSUMMON_DEAD_DESPAWN, 0); - if (pCreature) + creature = me->SummonCreature(SpiritInfo[i].entry, SpiritInfo[i].x, SpiritInfo[i].y, SpiritInfo[i].z, SpiritInfo[i].orient, TEMPSUMMON_DEAD_DESPAWN, 0); + if (creature) { - pCreature->CastSpell(pCreature, SPELL_SPIRIT_AURA, true); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - SpiritGUID[i] = pCreature->GetGUID(); + creature->CastSpell(creature, SPELL_SPIRIT_AURA, true); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + SpiritGUID[i] = creature->GetGUID(); } } } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index b7de5302fd9..cc037ff403d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -150,36 +150,36 @@ class npc_zulaman_hostage : public CreatureScript return new npc_zulaman_hostageAI(creature); } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CLOSE_GOSSIP_MENU(); - if (!pCreature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) + if (!creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) return true; - pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - InstanceScript* pInstance = pCreature->GetInstanceScript(); + InstanceScript* pInstance = creature->GetInstanceScript(); if (pInstance) { //uint8 progress = pInstance->GetData(DATA_CHESTLOOTED); pInstance->SetData(DATA_CHESTLOOTED, 0); float x, y, z; - pCreature->GetPosition(x, y, z); - uint32 entry = pCreature->GetEntry(); + creature->GetPosition(x, y, z); + uint32 entry = creature->GetEntry(); for (uint8 i = 0; i < 4; ++i) { if (HostageEntry[i] == entry) { - pCreature->SummonGameObject(ChestEntry[i], x-2, y, z, 0, 0, 0, 0, 0, 0); + creature->SummonGameObject(ChestEntry[i], x-2, y, z, 0, 0, 0, 0, 0, 0); break; } } |
