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 | |
| parent | 3ddc1cc4c40b757dd42b781552b483a047a6df64 (diff) | |
Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
118 files changed, 876 insertions, 876 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 9cfd1e60b2b..0f91a74de16 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -143,9 +143,9 @@ class npc_grimstone : public CreatureScript public: npc_grimstone() : CreatureScript("npc_grimstone") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_grimstoneAI(pCreature); + return new npc_grimstoneAI(creature); } struct npc_grimstoneAI : public npc_escortAI @@ -384,9 +384,9 @@ class mob_phalanx : public CreatureScript public: mob_phalanx() : CreatureScript("mob_phalanx") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_phalanxAI (pCreature); + return new mob_phalanxAI (creature); } struct mob_phalanxAI : public ScriptedAI @@ -467,43 +467,43 @@ class npc_kharan_mighthammer : public CreatureScript public: npc_kharan_mighthammer() : CreatureScript("npc_kharan_mighthammer") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(2475, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2475, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(2476, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2476, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(2477, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2477, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(2478, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2478, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(2479, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2479, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - pPlayer->SEND_GOSSIP_MENU(2480, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2480, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8); - pPlayer->SEND_GOSSIP_MENU(2481, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2481, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+8: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); - pPlayer->SEND_GOSSIP_MENU(2482, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2482, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+9: pPlayer->CLOSE_GOSSIP_MENU(); @@ -516,10 +516,10 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -528,9 +528,9 @@ public: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); if (pPlayer->GetTeam() == HORDE) - pPlayer->SEND_GOSSIP_MENU(2473, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2473, creature->GetGUID()); else - pPlayer->SEND_GOSSIP_MENU(2474, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2474, creature->GetGUID()); return true; } @@ -565,7 +565,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript public: npc_lokhtos_darkbargainer() : CreatureScript("npc_lokhtos_darkbargainer") { } - 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) @@ -574,17 +574,17 @@ public: pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false); } if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(creature->GetGUID()); return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); - if (pCreature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY) + if (creature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (pPlayer->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 && @@ -595,9 +595,9 @@ public: } if (pPlayer->GetReputationRank(59) < REP_FRIENDLY) - pPlayer->SEND_GOSSIP_MENU(3673, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3673, creature->GetGUID()); else - pPlayer->SEND_GOSSIP_MENU(3677, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3677, creature->GetGUID()); return true; } @@ -622,9 +622,9 @@ class npc_dughal_stormwing : public CreatureScript public: npc_dughal_stormwing() : CreatureScript("npc_dughal_stormwing") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(pCreature); + npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(creature); dughal_stormwingAI->AddWaypoint(0, 280.42f, -82.86f, -77.12f, 0); dughal_stormwingAI->AddWaypoint(1, 287.64f, -87.01f, -76.79f, 0); @@ -633,25 +633,25 @@ public: return dughal_stormwingAI; } - 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(); - CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); - pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, pPlayer->GetGUID()); + creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2846, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2846, creature->GetGUID()); } return true; } @@ -733,9 +733,9 @@ class npc_marshal_windsor : public CreatureScript public: npc_marshal_windsor() : CreatureScript("npc_marshal_windsor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(pCreature); + npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(creature); marshal_windsorAI->AddWaypoint(0, 316.336f, -225.528f, -77.7258f, 7000); marshal_windsorAI->AddWaypoint(1, 316.336f, -225.528f, -77.7258f, 2000); @@ -761,15 +761,15 @@ public: return marshal_windsorAI; } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) { if (quest->GetQuestId() == 4322) {PlayerStart = player; if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) { - CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); - pCreature->setFaction(11); + creature->setFaction(11); } } @@ -907,9 +907,9 @@ class npc_marshal_reginald_windsor : public CreatureScript public: npc_marshal_reginald_windsor() : CreatureScript("npc_marshal_reginald_windsor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(pCreature); + npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(creature); marshal_reginald_windsorAI->AddWaypoint(0, 403.61f, -52.71f, -63.92f, 4000); marshal_reginald_windsorAI->AddWaypoint(1, 403.61f, -52.71f, -63.92f, 4000); @@ -1110,9 +1110,9 @@ class npc_tobias_seecher : public CreatureScript public: npc_tobias_seecher() : CreatureScript("npc_tobias_seecher") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(pCreature); + npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(creature); tobias_seecherAI->AddWaypoint(0, 549.21f, -281.07f, -75.27f); tobias_seecherAI->AddWaypoint(1, 554.39f, -267.39f, -73.68f); @@ -1123,25 +1123,25 @@ public: return tobias_seecherAI; } - 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(); - CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); - pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, pPlayer->GetGUID()); + creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2847, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2847, creature->GetGUID()); } return true; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index faaf94dbc65..ad663415cbe 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -35,9 +35,9 @@ class boss_ambassador_flamelash : public CreatureScript public: boss_ambassador_flamelash() : CreatureScript("boss_ambassador_flamelash") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ambassador_flamelashAI (pCreature); + return new boss_ambassador_flamelashAI (creature); } struct boss_ambassador_flamelashAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp index 0186abdf600..e97a0fd4ab4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp @@ -39,9 +39,9 @@ class boss_anubshiah : public CreatureScript public: boss_anubshiah() : CreatureScript("boss_anubshiah") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_anubshiahAI (pCreature); + return new boss_anubshiahAI (creature); } struct boss_anubshiahAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index fed30b98056..ac5c0b70fd4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -42,9 +42,9 @@ class boss_emperor_dagran_thaurissan : public CreatureScript public: boss_emperor_dagran_thaurissan() : CreatureScript("boss_emperor_dagran_thaurissan") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_draganthaurissanAI (pCreature); + return new boss_draganthaurissanAI (creature); } struct boss_draganthaurissanAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index 65d1d78b30e..9b290b2e352 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -37,9 +37,9 @@ class boss_general_angerforge : public CreatureScript public: boss_general_angerforge() : CreatureScript("boss_general_angerforge") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_general_angerforgeAI (pCreature); + return new boss_general_angerforgeAI (creature); } struct boss_general_angerforgeAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp index 6e5f597ce45..c82c5f82965 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -36,9 +36,9 @@ class boss_gorosh_the_dervish : public CreatureScript public: boss_gorosh_the_dervish() : CreatureScript("boss_gorosh_the_dervish") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_gorosh_the_dervishAI (pCreature); + return new boss_gorosh_the_dervishAI (creature); } struct boss_gorosh_the_dervishAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp index 60d6b017ac8..e8b794a2edb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp @@ -36,9 +36,9 @@ class boss_grizzle : public CreatureScript public: boss_grizzle() : CreatureScript("boss_grizzle") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_grizzleAI (pCreature); + return new boss_grizzleAI (creature); } struct boss_grizzleAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 7909d9e6e39..ab6a2918ad4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -38,9 +38,9 @@ class boss_high_interrogator_gerstahn : public CreatureScript public: boss_high_interrogator_gerstahn() : CreatureScript("boss_high_interrogator_gerstahn") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_high_interrogator_gerstahnAI (pCreature); + return new boss_high_interrogator_gerstahnAI (creature); } struct boss_high_interrogator_gerstahnAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index ce1cee169d7..2fc97caa3dd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -41,9 +41,9 @@ class boss_magmus : public CreatureScript public: boss_magmus() : CreatureScript("boss_magmus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_magmusAI (pCreature); + return new boss_magmusAI (creature); } struct boss_magmusAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp index 79fc21e6164..ac05f8d86bb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -40,9 +40,9 @@ class boss_moira_bronzebeard : public CreatureScript public: boss_moira_bronzebeard() : CreatureScript("boss_moira_bronzebeard") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_moira_bronzebeardAI (pCreature); + return new boss_moira_bronzebeardAI (creature); } struct boss_moira_bronzebeardAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index a29156785e0..4029724432f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -52,26 +52,26 @@ class boss_gloomrel : public CreatureScript public: boss_gloomrel() : CreatureScript("boss_gloomrel") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(2606, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2606, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer, SPELL_LEARN_SMELT, false); + creature->CastSpell(pPlayer, SPELL_LEARN_SMELT, false); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); - pPlayer->SEND_GOSSIP_MENU(2604, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2604, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+22: pPlayer->CLOSE_GOSSIP_MENU(); - if (InstanceScript* pInstance = pCreature->GetInstanceScript()) + if (InstanceScript* pInstance = creature->GetInstanceScript()) { //are 5 minutes expected? go template may have data to despawn when used at quest pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE), MINUTE*5); @@ -81,7 +81,7 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 1 && pPlayer->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN && !pPlayer->HasSpell(SPELL_SMELT_DARK_IRON)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -89,7 +89,7 @@ public: if (pPlayer->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 0 && pPlayer->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -112,22 +112,22 @@ class boss_doomrel : public CreatureScript public: boss_doomrel() : CreatureScript("boss_doomrel") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_DOOMREL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(2605, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2605, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); //start event here - pCreature->setFaction(FACTION_HOSTILE); - pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - pCreature->AI()->AttackStart(pPlayer); - InstanceScript* pInstance = pCreature->GetInstanceScript(); + creature->setFaction(FACTION_HOSTILE); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + creature->AI()->AttackStart(pPlayer); + InstanceScript* pInstance = creature->GetInstanceScript(); if (pInstance) pInstance->SetData64(DATA_EVENSTARTER, pPlayer->GetGUID()); break; @@ -135,17 +135,17 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2601, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2601, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_doomrelAI (pCreature); + return new boss_doomrelAI (creature); } struct boss_doomrelAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index 4e69f1a7e42..c9b5a172c65 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -38,9 +38,9 @@ class boss_broodlord : public CreatureScript public: boss_broodlord() : CreatureScript("boss_broodlord") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_broodlordAI (pCreature); + return new boss_broodlordAI (creature); } struct boss_broodlordAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 8d95df9c949..1a6072c1d3a 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -64,9 +64,9 @@ class boss_chromaggus : public CreatureScript public: boss_chromaggus() : CreatureScript("boss_chromaggus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_chromaggusAI (pCreature); + return new boss_chromaggusAI (creature); } struct boss_chromaggusAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index 653da086b68..4c57c4336d9 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -35,9 +35,9 @@ class boss_ebonroc : public CreatureScript public: boss_ebonroc() : CreatureScript("boss_ebonroc") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ebonrocAI (pCreature); + return new boss_ebonrocAI (creature); } struct boss_ebonrocAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index f27d190b7a0..9d53a7a0a95 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -34,9 +34,9 @@ class boss_firemaw : public CreatureScript public: boss_firemaw() : CreatureScript("boss_firemaw") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_firemawAI (pCreature); + return new boss_firemawAI (creature); } struct boss_firemawAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index 279b99c1163..4e44a70475f 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -36,9 +36,9 @@ class boss_flamegor : public CreatureScript public: boss_flamegor() : CreatureScript("boss_flamegor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_flamegorAI (pCreature); + return new boss_flamegorAI (creature); } struct boss_flamegorAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index bb122b173fe..89298862688 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -65,9 +65,9 @@ class boss_nefarian : public CreatureScript public: boss_nefarian() : CreatureScript("boss_nefarian") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_nefarianAI (pCreature); + return new boss_nefarianAI (creature); } struct boss_nefarianAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index 4303e53199a..effcb5293dd 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -42,9 +42,9 @@ class boss_razorgore : public CreatureScript public: boss_razorgore() : CreatureScript("boss_razorgore") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_razorgoreAI (pCreature); + return new boss_razorgoreAI (creature); } struct boss_razorgoreAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index 0f34e0b2b34..46be0b9921b 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -45,38 +45,38 @@ class boss_vaelastrasz : public CreatureScript public: boss_vaelastrasz() : CreatureScript("boss_vaelastrasz") { } - void SendDefaultMenu(Player* pPlayer, Creature* pCreature, uint32 uiAction) + void SendDefaultMenu(Player* pPlayer, Creature* creature, uint32 uiAction) { if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(boss_vaelastrasz::boss_vaelAI, pCreature->AI())->BeginSpeech(pPlayer); + CAST_AI(boss_vaelastrasz::boss_vaelAI, creature->AI())->BeginSpeech(pPlayer); } } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 uiSender, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); if (uiSender == GOSSIP_SENDER_MAIN) - SendDefaultMenu(pPlayer, pCreature, uiAction); + SendDefaultMenu(pPlayer, creature, uiAction); return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_vaelAI (pCreature); + return new boss_vaelAI (creature); } struct boss_vaelAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index d13e5db8238..b82ea5710c5 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -74,38 +74,38 @@ class boss_victor_nefarius : public CreatureScript public: boss_victor_nefarius() : CreatureScript("boss_victor_nefarius") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(7198, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7198, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(7199, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7199, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); - DoScriptText(SAY_GAMESBEGIN_1, pCreature); - CAST_AI(boss_victor_nefarius::boss_victor_nefariusAI, pCreature->AI())->BeginEvent(pPlayer); + DoScriptText(SAY_GAMESBEGIN_1, creature); + CAST_AI(boss_victor_nefarius::boss_victor_nefariusAI, creature->AI())->BeginEvent(pPlayer); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(7134, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7134, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_victor_nefariusAI (pCreature); + return new boss_victor_nefariusAI (creature); } struct boss_victor_nefariusAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 2a7ca7ff872..c0be771ce4b 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -42,16 +42,16 @@ class boss_mr_smite : public CreatureScript public: boss_mr_smite() : CreatureScript("boss_mr_smite") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_mr_smiteAI (pCreature); + return new boss_mr_smiteAI (creature); } struct boss_mr_smiteAI : public ScriptedAI { - boss_mr_smiteAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_mr_smiteAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 9b43dc457a9..8e7011a7b4f 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -90,45 +90,45 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript public: npc_blastmaster_emi_shortfuse() : CreatureScript("npc_blastmaster_emi_shortfuse") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_blastmaster_emi_shortfuseAI(pCreature); + return new npc_blastmaster_emi_shortfuseAI(creature); } - 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) { - if (npc_escortAI* pEscortAI = CAST_AI(npc_blastmaster_emi_shortfuse::npc_blastmaster_emi_shortfuseAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_blastmaster_emi_shortfuse::npc_blastmaster_emi_shortfuseAI, creature->AI())) pEscortAI->Start(true, false, pPlayer->GetGUID()); - pCreature->setFaction(pPlayer->getFaction()); - pCreature->AI()->SetData(1, 0); + creature->setFaction(pPlayer->getFaction()); + creature->AI()->SetData(1, 0); pPlayer->CLOSE_GOSSIP_MENU(); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - InstanceScript* pInstance = pCreature->GetInstanceScript(); + InstanceScript* pInstance = creature->GetInstanceScript(); if (pInstance && pInstance->GetData(TYPE_EVENT) == NOT_STARTED) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_EMI, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_EMI, creature->GetGUID()); return true; } struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI { - npc_blastmaster_emi_shortfuseAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_blastmaster_emi_shortfuseAI(Creature* creature) : npc_escortAI(creature) { - pInstance = pCreature->GetInstanceScript(); - pCreature->RestoreFaction(); + pInstance = creature->GetInstanceScript(); + creature->RestoreFaction(); Reset(); } @@ -548,14 +548,14 @@ class boss_grubbis : public CreatureScript public: boss_grubbis() : CreatureScript("boss_grubbis") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_grubbisAI(pCreature); + return new boss_grubbisAI(creature); } struct boss_grubbisAI : public ScriptedAI { - boss_grubbisAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_grubbisAI(Creature* creature) : ScriptedAI(creature) { SetDataSummoner(); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 56e28dbdcc2..65a122798fe 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -48,9 +48,9 @@ class boss_curator : public CreatureScript public: boss_curator() : CreatureScript("boss_curator") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_curatorAI (pCreature); + return new boss_curatorAI (creature); } struct boss_curatorAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 39c210e7395..cdf63ee0edc 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -44,9 +44,9 @@ class boss_maiden_of_virtue : public CreatureScript public: boss_maiden_of_virtue() : CreatureScript("boss_maiden_of_virtue") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_maiden_of_virtueAI (pCreature); + return new boss_maiden_of_virtueAI (creature); } struct boss_maiden_of_virtueAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index adde1d9bf4a..283cbb7fdf7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -51,9 +51,9 @@ class boss_attumen : public CreatureScript public: boss_attumen() : CreatureScript("boss_attumen") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_attumenAI (pCreature); + return new boss_attumenAI (creature); } struct boss_attumenAI : public ScriptedAI @@ -112,9 +112,9 @@ class boss_midnight : public CreatureScript public: boss_midnight() : CreatureScript("boss_midnight") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_midnightAI(pCreature); + return new boss_midnightAI(creature); } struct boss_midnightAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 4fbf14be475..ff80d63e0de 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -65,9 +65,9 @@ class boss_moroes : public CreatureScript public: boss_moroes() : CreatureScript("boss_moroes") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_moroesAI (pCreature); + return new boss_moroesAI (creature); } struct boss_moroesAI : public ScriptedAI @@ -155,7 +155,7 @@ public: DeSpawnAdds(); if (isAddlistEmpty()) { - Creature* pCreature = NULL; + Creature* creature = NULL; std::vector<uint32> AddList; for (uint8 i = 0; i < 6; ++i) @@ -169,10 +169,10 @@ public: { uint32 entry = *itr; - pCreature = me->SummonCreature(entry, Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - if (pCreature) + creature = me->SummonCreature(entry, Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + if (creature) { - AddGUID[i] = pCreature->GetGUID(); + AddGUID[i] = creature->GetGUID(); AddId[i] = entry; } ++i; @@ -181,10 +181,10 @@ public: { for (uint8 i = 0; i < 4; ++i) { - Creature* pCreature = me->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - if (pCreature) + Creature* creature = me->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + if (creature) { - AddGUID[i] = pCreature->GetGUID(); + AddGUID[i] = creature->GetGUID(); } } } @@ -409,9 +409,9 @@ class boss_baroness_dorothea_millstipe : public CreatureScript public: boss_baroness_dorothea_millstipe() : CreatureScript("boss_baroness_dorothea_millstipe") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_baroness_dorothea_millstipeAI (pCreature); + return new boss_baroness_dorothea_millstipeAI (creature); } struct boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI @@ -473,9 +473,9 @@ class boss_baron_rafe_dreuger : public CreatureScript public: boss_baron_rafe_dreuger() : CreatureScript("boss_baron_rafe_dreuger") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_baron_rafe_dreugerAI (pCreature); + return new boss_baron_rafe_dreugerAI (creature); } struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI @@ -531,9 +531,9 @@ class boss_lady_catriona_von_indi : public CreatureScript public: boss_lady_catriona_von_indi() : CreatureScript("boss_lady_catriona_von_indi") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lady_catriona_von_indiAI (pCreature); + return new boss_lady_catriona_von_indiAI (creature); } struct boss_lady_catriona_von_indiAI : public boss_moroes_guestAI @@ -602,9 +602,9 @@ class boss_lady_keira_berrybuck : public CreatureScript public: boss_lady_keira_berrybuck() : CreatureScript("boss_lady_keira_berrybuck") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lady_keira_berrybuckAI (pCreature); + return new boss_lady_keira_berrybuckAI (creature); } struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI @@ -677,9 +677,9 @@ class boss_lord_robin_daris : public CreatureScript public: boss_lord_robin_daris() : CreatureScript("boss_lord_robin_daris") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lord_robin_darisAI (pCreature); + return new boss_lord_robin_darisAI (creature); } struct boss_lord_robin_darisAI : public boss_moroes_guestAI @@ -734,9 +734,9 @@ class boss_lord_crispin_ference : public CreatureScript public: boss_lord_crispin_ference() : CreatureScript("boss_lord_crispin_ference") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lord_crispin_ferenceAI (pCreature); + return new boss_lord_crispin_ferenceAI (creature); } struct boss_lord_crispin_ferenceAI : public boss_moroes_guestAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index efc4a2d3442..1e06cdf1eb4 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -63,9 +63,9 @@ class boss_netherspite : public CreatureScript public: boss_netherspite() : CreatureScript("boss_netherspite") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_netherspiteAI(pCreature); + return new boss_netherspiteAI(creature); } struct boss_netherspiteAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 3e4d92f0e97..5cd9f80217c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -63,9 +63,9 @@ class boss_nightbane : public CreatureScript public: boss_nightbane() : CreatureScript("boss_nightbane") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_nightbaneAI (pCreature); + return new boss_nightbaneAI (creature); } struct boss_nightbaneAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index daad47b6106..24352f93027 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -101,9 +101,9 @@ class netherspite_infernal : public CreatureScript public: netherspite_infernal() : CreatureScript("netherspite_infernal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new netherspite_infernalAI (pCreature); + return new netherspite_infernalAI (creature); } struct netherspite_infernalAI : public ScriptedAI @@ -176,9 +176,9 @@ class boss_malchezaar : public CreatureScript public: boss_malchezaar() : CreatureScript("boss_malchezaar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_malchezaarAI (pCreature); + return new boss_malchezaarAI (creature); } struct boss_malchezaarAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 537af931b08..1a5382356ff 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -86,9 +86,9 @@ class boss_shade_of_aran : public CreatureScript public: boss_shade_of_aran() : CreatureScript("boss_shade_of_aran") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_aranAI (pCreature); + return new boss_aranAI (creature); } struct boss_aranAI : public ScriptedAI @@ -516,9 +516,9 @@ class mob_aran_elemental : public CreatureScript public: mob_aran_elemental() : CreatureScript("mob_aran_elemental") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new water_elementalAI (pCreature); + return new water_elementalAI (creature); } struct water_elementalAI : public ScriptedAI @@ -555,10 +555,10 @@ class mob_shadow_of_aran : public CreatureScript public: mob_shadow_of_aran() : CreatureScript("mob_shadow_of_aran") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - sLog->outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry()); - SimpleAI* ai = new SimpleAI (pCreature); + sLog->outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", creature->GetEntry()); + SimpleAI* ai = new SimpleAI (creature); ai->Spell[0].Enabled = true; ai->Spell[0].Spell_Id = SPELL_SHADOW_PYRO; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index 93eaf7098c2..477dcf0f7bf 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -61,9 +61,9 @@ class mob_kilrek : public CreatureScript public: mob_kilrek() : CreatureScript("mob_kilrek") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_kilrekAI (pCreature); + return new mob_kilrekAI (creature); } struct mob_kilrekAI : public ScriptedAI @@ -133,9 +133,9 @@ class mob_demon_chain : public CreatureScript public: mob_demon_chain() : CreatureScript("mob_demon_chain") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_demon_chainAI(pCreature); + return new mob_demon_chainAI(creature); } struct mob_demon_chainAI : public ScriptedAI @@ -171,9 +171,9 @@ class mob_fiendish_portal : public CreatureScript public: mob_fiendish_portal() : CreatureScript("mob_fiendish_portal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_fiendish_portalAI (pCreature); + return new mob_fiendish_portalAI (creature); } struct mob_fiendish_portalAI : public PassiveAI @@ -208,9 +208,9 @@ class mob_fiendish_imp : public CreatureScript public: mob_fiendish_imp() : CreatureScript("mob_fiendish_imp") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_fiendish_impAI (pCreature); + return new mob_fiendish_impAI (creature); } struct mob_fiendish_impAI : public ScriptedAI @@ -251,9 +251,9 @@ class boss_terestian_illhoof : public CreatureScript public: boss_terestian_illhoof() : CreatureScript("boss_terestian_illhoof") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_terestianAI (pCreature); + return new boss_terestianAI (creature); } struct boss_terestianAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 5feb1ff924e..8d6944b0531 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -88,16 +88,16 @@ EndScriptData */ #define CREATURE_CYCLONE 18412 #define CREATURE_CRONE 18168 -void SummonCroneIfReady(InstanceScript* pInstance, Creature* pCreature) +void SummonCroneIfReady(InstanceScript* pInstance, Creature* creature) { pInstance->SetData(DATA_OPERA_OZ_DEATHCOUNT, SPECIAL); // Increment DeathCount if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4) { - if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, pCreature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) + if (Creature* pCrone = creature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, creature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) { - if (pCreature->getVictim()) - pCrone->AI()->AttackStart(pCreature->getVictim()); + if (creature->getVictim()) + pCrone->AI()->AttackStart(creature->getVictim()); } } }; @@ -107,9 +107,9 @@ class boss_dorothee : public CreatureScript public: boss_dorothee() : CreatureScript("boss_dorothee") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_dorotheeAI(pCreature); + return new boss_dorotheeAI(creature); } struct boss_dorotheeAI : public ScriptedAI @@ -222,9 +222,9 @@ class mob_tito : public CreatureScript public: mob_tito() : CreatureScript("mob_tito") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_titoAI(pCreature); + return new mob_titoAI(creature); } struct mob_titoAI : public ScriptedAI @@ -289,9 +289,9 @@ class boss_strawman : public CreatureScript public: boss_strawman() : CreatureScript("boss_strawman") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_strawmanAI(pCreature); + return new boss_strawmanAI(creature); } struct boss_strawmanAI : public ScriptedAI @@ -404,9 +404,9 @@ class boss_tinhead : public CreatureScript public: boss_tinhead() : CreatureScript("boss_tinhead") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_tinheadAI(pCreature); + return new boss_tinheadAI(creature); } struct boss_tinheadAI : public ScriptedAI @@ -514,9 +514,9 @@ class boss_roar : public CreatureScript public: boss_roar() : CreatureScript("boss_roar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_roarAI(pCreature); + return new boss_roarAI(creature); } struct boss_roarAI : public ScriptedAI @@ -623,9 +623,9 @@ class boss_crone : public CreatureScript public: boss_crone() : CreatureScript("boss_crone") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_croneAI(pCreature); + return new boss_croneAI(creature); } struct boss_croneAI : public ScriptedAI @@ -705,9 +705,9 @@ class mob_cyclone : public CreatureScript public: mob_cyclone() : CreatureScript("mob_cyclone") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_cycloneAI(pCreature); + return new mob_cycloneAI(creature); } struct mob_cycloneAI : public ScriptedAI @@ -769,24 +769,24 @@ class npc_grandmother : public CreatureScript public: npc_grandmother() : CreatureScript("npc_grandmother") { } - 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) { - if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) + if (Creature* pBigBadWolf = creature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) pBigBadWolf->AI()->AttackStart(pPlayer); - pCreature->DespawnOrUnsummon(); + creature->DespawnOrUnsummon(); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(8990, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8990, creature->GetGUID()); return true; } @@ -798,9 +798,9 @@ class boss_bigbadwolf : public CreatureScript public: boss_bigbadwolf() : CreatureScript("boss_bigbadwolf") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_bigbadwolfAI(pCreature); + return new boss_bigbadwolfAI(creature); } struct boss_bigbadwolfAI : public ScriptedAI @@ -966,15 +966,15 @@ enum RAJPhase PHASE_BOTH = 2, }; -void PretendToDie(Creature* pCreature) +void PretendToDie(Creature* creature) { - pCreature->InterruptNonMeleeSpells(true); - pCreature->RemoveAllAuras(); - pCreature->SetHealth(0); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - pCreature->GetMotionMaster()->MovementExpired(false); - pCreature->GetMotionMaster()->MoveIdle(); - pCreature->SetStandState(UNIT_STAND_STATE_DEAD); + creature->InterruptNonMeleeSpells(true); + creature->RemoveAllAuras(); + creature->SetHealth(0); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + creature->GetMotionMaster()->MovementExpired(false); + creature->GetMotionMaster()->MoveIdle(); + creature->SetStandState(UNIT_STAND_STATE_DEAD); }; void Resurrect(Creature* pTarget) @@ -997,9 +997,9 @@ class boss_julianne : public CreatureScript public: boss_julianne() : CreatureScript("boss_julianne") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_julianneAI(pCreature); + return new boss_julianneAI(creature); } struct boss_julianneAI : public ScriptedAI @@ -1120,9 +1120,9 @@ class boss_romulo : public CreatureScript public: boss_romulo() : CreatureScript("boss_romulo") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_romuloAI(pCreature); + return new boss_romuloAI(creature); } struct boss_romuloAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 9d643667e7b..a4c9d6f1b9c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -252,11 +252,11 @@ public: uint32 entry = ((uint32)Spawns[index][0]); float PosX = Spawns[index][1]; - if (Creature* pCreature = me->SummonCreature(entry, PosX, SPAWN_Y, SPAWN_Z, SPAWN_O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) + if (Creature* creature = me->SummonCreature(entry, PosX, SPAWN_Y, SPAWN_Z, SPAWN_O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) { // In case database has bad flags - pCreature->SetUInt32Value(UNIT_FIELD_FLAGS, 0); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->SetUInt32Value(UNIT_FIELD_FLAGS, 0); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } } @@ -324,16 +324,16 @@ public: } }; - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); - npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, pCreature->AI()); + npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(8971, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8971, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); @@ -359,9 +359,9 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (InstanceScript* pInstance = pCreature->GetInstanceScript()) + if (InstanceScript* pInstance = creature->GetInstanceScript()) { // Check for death of Moroes and if opera event is not done already if (pInstance->GetData(TYPE_MOROES) == DONE && pInstance->GetData(TYPE_OPERA) != DONE) @@ -375,25 +375,25 @@ public: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); } - if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, pCreature->AI())) + if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI())) { if (!pBarnesAI->RaidWiped) - pPlayer->SEND_GOSSIP_MENU(8970, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8970, creature->GetGUID()); else - pPlayer->SEND_GOSSIP_MENU(8975, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8975, creature->GetGUID()); return true; } } } - pPlayer->SEND_GOSSIP_MENU(8978, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8978, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_barnesAI(pCreature); + return new npc_barnesAI(creature); } }; @@ -414,7 +414,7 @@ class npc_berthold : public CreatureScript public: npc_berthold() : CreatureScript("npc_berthold") { } - 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) @@ -424,16 +424,16 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (InstanceScript* pInstance = pCreature->GetInstanceScript()) + if (InstanceScript* pInstance = creature->GetInstanceScript()) { // Check if Shade of Aran event is done if (pInstance->GetData(TYPE_ARAN) == DONE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, 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; } @@ -467,9 +467,9 @@ class npc_image_of_medivh : public CreatureScript public: npc_image_of_medivh() : CreatureScript("npc_image_of_medivh") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_image_of_medivhAI(pCreature); + return new npc_image_of_medivhAI(creature); } struct npc_image_of_medivhAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 1e2177cab74..bcd355873bf 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -92,9 +92,9 @@ class boss_priestess_delrissa : public CreatureScript public: boss_priestess_delrissa() : CreatureScript("boss_priestess_delrissa") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_priestess_delrissaAI(pCreature); + return new boss_priestess_delrissaAI(creature); } struct boss_priestess_delrissaAI : public ScriptedAI @@ -486,9 +486,9 @@ class boss_kagani_nightstrike : public CreatureScript public: boss_kagani_nightstrike() : CreatureScript("boss_kagani_nightstrike") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kagani_nightstrikeAI(pCreature); + return new boss_kagani_nightstrikeAI(creature); } struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI @@ -591,9 +591,9 @@ class boss_ellris_duskhallow : public CreatureScript public: boss_ellris_duskhallow() : CreatureScript("boss_ellris_duskhallow") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ellris_duskhallowAI(pCreature); + return new boss_ellris_duskhallowAI(creature); } struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI @@ -683,9 +683,9 @@ class boss_eramas_brightblaze : public CreatureScript public: boss_eramas_brightblaze() : CreatureScript("boss_eramas_brightblaze") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_eramas_brightblazeAI(pCreature); + return new boss_eramas_brightblazeAI(creature); } struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI @@ -745,9 +745,9 @@ class boss_yazzai : public CreatureScript public: boss_yazzai() : CreatureScript("boss_yazzai") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_yazzaiAI(pCreature); + return new boss_yazzaiAI(creature); } struct boss_yazzaiAI : public boss_priestess_lackey_commonAI @@ -876,9 +876,9 @@ class boss_warlord_salaris : public CreatureScript public: boss_warlord_salaris() : CreatureScript("boss_warlord_salaris") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_warlord_salarisAI(pCreature); + return new boss_warlord_salarisAI(creature); } struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI @@ -997,9 +997,9 @@ class boss_garaxxas : public CreatureScript public: boss_garaxxas() : CreatureScript("boss_garaxxas") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_garaxxasAI(pCreature); + return new boss_garaxxasAI(creature); } struct boss_garaxxasAI : public boss_priestess_lackey_commonAI @@ -1117,9 +1117,9 @@ class boss_apoko : public CreatureScript public: boss_apoko() : CreatureScript("boss_apoko") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_apokoAI(pCreature); + return new boss_apokoAI(creature); } struct boss_apokoAI : public boss_priestess_lackey_commonAI @@ -1216,9 +1216,9 @@ class boss_zelfan : public CreatureScript public: boss_zelfan() : CreatureScript("boss_zelfan") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_zelfanAI(pCreature); + return new boss_zelfanAI(creature); } struct boss_zelfanAI : public boss_priestess_lackey_commonAI @@ -1302,9 +1302,9 @@ class mob_high_explosive_sheep : public CreatureScript public: mob_high_explosive_sheep() : CreatureScript("mob_high_explosive_sheep") { } - //CreatureAI* GetAI(Creature* pCreature) const + //CreatureAI* GetAI(Creature* creature) const //{ - // return new mob_high_explosive_sheepAI (pCreature); + // return new mob_high_explosive_sheepAI (creature); //}; }; */ diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 025c121a178..8b68330717f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -56,9 +56,9 @@ class boss_selin_fireheart : public CreatureScript public: boss_selin_fireheart() : CreatureScript("boss_selin_fireheart") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_selin_fireheartAI (pCreature); + return new boss_selin_fireheartAI (creature); }; struct boss_selin_fireheartAI : public ScriptedAI @@ -326,9 +326,9 @@ class mob_fel_crystal : public CreatureScript public: mob_fel_crystal() : CreatureScript("mob_fel_crystal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_fel_crystalAI (pCreature); + return new mob_fel_crystalAI (creature); }; struct mob_fel_crystalAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index ad3b6896968..b742e9702b5 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -64,9 +64,9 @@ class boss_vexallus : public CreatureScript public: boss_vexallus() : CreatureScript("boss_vexallus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_vexallusAI (pCreature); + return new boss_vexallusAI (creature); }; struct boss_vexallusAI : public ScriptedAI @@ -199,9 +199,9 @@ class mob_pure_energy : public CreatureScript public: mob_pure_energy() : CreatureScript("mob_pure_energy") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_pure_energyAI (pCreature); + return new mob_pure_energyAI (creature); }; struct mob_pure_energyAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index d6fed004baa..f9ba0d7a4a2 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -56,54 +56,54 @@ class npc_kalecgos : public CreatureScript public: npc_kalecgos() : CreatureScript("npc_kalecgos") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(12500, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12500, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(12502, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12502, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(12606, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12606, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(12607, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12607, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: - pPlayer->SEND_GOSSIP_MENU(12608, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12608, creature->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(12498, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12498, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_kalecgosAI(pCreature); + return new npc_kalecgosAI(creature); } struct npc_kalecgosAI : public ScriptedAI { - npc_kalecgosAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_kalecgosAI(Creature* creature) : ScriptedAI(creature) {} uint32 m_uiTransformTimer; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp index 6c3e7f7d4f6..72f89c4f47d 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp @@ -52,7 +52,7 @@ class boss_baron_geddon : public CreatureScript struct boss_baron_geddonAI : public BossAI { - boss_baron_geddonAI(Creature* pCreature) : BossAI(pCreature, BOSS_BARON_GEDDON) + boss_baron_geddonAI(Creature* creature) : BossAI(creature, BOSS_BARON_GEDDON) { } @@ -110,9 +110,9 @@ class boss_baron_geddon : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_baron_geddonAI (pCreature); + return new boss_baron_geddonAI (creature); } }; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp index 384599041da..ebc6bcec24f 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp @@ -55,7 +55,7 @@ class boss_magmadar : public CreatureScript struct boss_magmadarAI : public BossAI { - boss_magmadarAI(Creature* pCreature) : BossAI(pCreature, BOSS_MAGMADAR) + boss_magmadarAI(Creature* creature) : BossAI(creature, BOSS_MAGMADAR) { } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp index c7c80015f63..e716e4a7361 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp @@ -76,7 +76,7 @@ class boss_majordomo : public CreatureScript struct boss_majordomoAI : public BossAI { - boss_majordomoAI(Creature* pCreature) : BossAI(pCreature, BOSS_MAJORDOMO_EXECUTUS) + boss_majordomoAI(Creature* creature) : BossAI(creature, BOSS_MAJORDOMO_EXECUTUS) { } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 9180edde7a0..3e28382efdf 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -79,7 +79,7 @@ class boss_ragnaros : public CreatureScript struct boss_ragnarosAI : public BossAI { - boss_ragnarosAI(Creature* pCreature) : BossAI(pCreature, BOSS_RAGNAROS) + boss_ragnarosAI(Creature* creature) : BossAI(creature, BOSS_RAGNAROS) { _introState = 0; me->SetReactState(REACT_PASSIVE); @@ -303,9 +303,9 @@ class boss_ragnaros : public CreatureScript bool _isBanished; }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ragnarosAI(pCreature); + return new boss_ragnarosAI(creature); } }; @@ -339,9 +339,9 @@ class mob_son_of_flame : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_son_of_flameAI(pCreature); + return new mob_son_of_flameAI(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp index d4f746b0cb3..d082140e34c 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp @@ -46,9 +46,9 @@ class mob_ancient_core_hound : public CreatureScript public: mob_ancient_core_hound() : CreatureScript("mob_ancient_core_hound") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - SimpleAI *ai = new SimpleAI(pCreature); + SimpleAI *ai = new SimpleAI(creature); ai->Spell[0].Enabled = true; ai->Spell[0].Spell_Id = SPELL_CONE_OF_FIRE; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index bc25fe7a753..34a30dd81bf 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -95,9 +95,9 @@ class npc_unworthy_initiate : public CreatureScript public: npc_unworthy_initiate() : CreatureScript("npc_unworthy_initiate") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_unworthy_initiateAI(pCreature); + return new npc_unworthy_initiateAI(creature); } struct npc_unworthy_initiateAI : public ScriptedAI @@ -286,9 +286,9 @@ class npc_unworthy_initiate_anchor : public CreatureScript public: npc_unworthy_initiate_anchor() : CreatureScript("npc_unworthy_initiate_anchor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_unworthy_initiate_anchorAI(pCreature); + return new npc_unworthy_initiate_anchorAI(creature); } struct npc_unworthy_initiate_anchorAI : public PassiveAI @@ -362,58 +362,58 @@ class npc_death_knight_initiate : public CreatureScript public: npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { } - 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) { pPlayer->CLOSE_GOSSIP_MENU(); - if (pPlayer->isInCombat() || pCreature->isInCombat()) + if (pPlayer->isInCombat() || creature->isInCombat()) return true; - if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiate::npc_death_knight_initiateAI, pCreature->AI())) + if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiate::npc_death_knight_initiateAI, creature->AI())) { if (pInitiateAI->m_bIsDuelInProgress) return true; } - pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15); int32 uiSayId = rand()% (sizeof(m_auiRandomSay)/sizeof(int32)); - DoScriptText(m_auiRandomSay[uiSayId], pCreature, pPlayer); + DoScriptText(m_auiRandomSay[uiSayId], creature, pPlayer); - pPlayer->CastSpell(pCreature, SPELL_DUEL, false); + pPlayer->CastSpell(creature, SPELL_DUEL, false); pPlayer->CastSpell(pPlayer, SPELL_DUEL_FLAG, true); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pPlayer->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && pCreature->IsFullHealth()) + if (pPlayer->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth()) { if (pPlayer->HealthBelowPct(10)) return true; - if (pPlayer->isInCombat() || pCreature->isInCombat()) + if (pPlayer->isInCombat() || creature->isInCombat()) return true; pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_death_knight_initiateAI(pCreature); + return new npc_death_knight_initiateAI(creature); } struct npc_death_knight_initiateAI : public CombatAI { - npc_death_knight_initiateAI(Creature* pCreature) : CombatAI(pCreature) + npc_death_knight_initiateAI(Creature* creature) : CombatAI(creature) { m_bIsDuelInProgress = false; } @@ -524,9 +524,9 @@ class npc_dark_rider_of_acherus : public CreatureScript public: npc_dark_rider_of_acherus() : CreatureScript("npc_dark_rider_of_acherus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_dark_rider_of_acherusAI(pCreature); + return new npc_dark_rider_of_acherusAI(creature); } struct npc_dark_rider_of_acherusAI : public ScriptedAI @@ -616,9 +616,9 @@ class npc_salanar_the_horseman : public CreatureScript public: npc_salanar_the_horseman() : CreatureScript("npc_salanar_the_horseman") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_salanar_the_horsemanAI(pCreature); + return new npc_salanar_the_horsemanAI(creature); } struct npc_salanar_the_horsemanAI : public ScriptedAI @@ -685,9 +685,9 @@ class npc_ros_dark_rider : public CreatureScript public: npc_ros_dark_rider() : CreatureScript("npc_ros_dark_rider") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_ros_dark_riderAI(pCreature); + return new npc_ros_dark_riderAI(creature); } struct npc_ros_dark_riderAI : public ScriptedAI @@ -736,9 +736,9 @@ class npc_dkc1_gothik : public CreatureScript public: npc_dkc1_gothik() : CreatureScript("npc_dkc1_gothik") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_dkc1_gothikAI(pCreature); + return new npc_dkc1_gothikAI(creature); } struct npc_dkc1_gothikAI : public ScriptedAI @@ -778,9 +778,9 @@ class npc_scarlet_ghoul : public CreatureScript public: npc_scarlet_ghoul() : CreatureScript("npc_scarlet_ghoul") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_scarlet_ghoulAI(pCreature); + return new npc_scarlet_ghoulAI(creature); } struct npc_scarlet_ghoulAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 50f761b4fa7..b68a7a5d777 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -49,14 +49,14 @@ class npc_crusade_persuaded : public CreatureScript public: npc_crusade_persuaded() : CreatureScript("npc_crusade_persuaded") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_crusade_persuadedAI (pCreature); + return new npc_crusade_persuadedAI (creature); } struct npc_crusade_persuadedAI : public ScriptedAI { - npc_crusade_persuadedAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_crusade_persuadedAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiSpeech_timer; uint32 uiSpeech_counter; @@ -177,26 +177,26 @@ class npc_koltira_deathweaver : public CreatureScript public: npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_BREAKOUT) { - pCreature->SetStandState(UNIT_STAND_STATE_STAND); + creature->SetStandState(UNIT_STAND_STATE_STAND); - if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, creature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID()); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_koltira_deathweaverAI(pCreature); + return new npc_koltira_deathweaverAI(creature); } struct npc_koltira_deathweaverAI : public npc_escortAI { - npc_koltira_deathweaverAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_koltira_deathweaverAI(Creature* creature) : npc_escortAI(creature) { me->SetReactState(REACT_DEFENSIVE); } @@ -356,14 +356,14 @@ class mob_scarlet_courier : public CreatureScript public: mob_scarlet_courier() : CreatureScript("mob_scarlet_courier") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_scarlet_courierAI (pCreature); + return new mob_scarlet_courierAI (creature); } struct mob_scarlet_courierAI : public ScriptedAI { - mob_scarlet_courierAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_scarlet_courierAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiStage; uint32 uiStage_timer; @@ -450,14 +450,14 @@ class mob_high_inquisitor_valroth : public CreatureScript public: mob_high_inquisitor_valroth() : CreatureScript("mob_high_inquisitor_valroth") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_high_inquisitor_valrothAI (pCreature); + return new mob_high_inquisitor_valrothAI (creature); } struct mob_high_inquisitor_valrothAI : public ScriptedAI { - mob_high_inquisitor_valrothAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiRenew_timer; uint32 uiInquisitor_Penance_timer; @@ -586,14 +586,14 @@ class npc_a_special_surprise : public CreatureScript public: npc_a_special_surprise() : CreatureScript("npc_a_special_surprise") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_a_special_surpriseAI(pCreature); + return new npc_a_special_surpriseAI(creature); } struct npc_a_special_surpriseAI : public ScriptedAI { - npc_a_special_surpriseAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_a_special_surpriseAI(Creature* creature) : ScriptedAI(creature) {} uint32 ExecuteSpeech_Timer; uint32 ExecuteSpeech_Counter; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 04d8244ffc7..ca0c19e7032 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -287,41 +287,41 @@ class npc_highlord_darion_mograine : public CreatureScript public: npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, pCreature->AI())->uiStep = 1; - CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, pCreature->AI())->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->uiStep = 1; + CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->Start(true, false, pPlayer->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(0, "I am ready.", 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; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_highlord_darion_mograineAI(pCreature); + return new npc_highlord_darion_mograineAI(creature); } struct npc_highlord_darion_mograineAI : public npc_escortAI { - npc_highlord_darion_mograineAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_highlord_darion_mograineAI(Creature* creature) : npc_escortAI(creature) { Reset(); } @@ -1671,14 +1671,14 @@ class npc_the_lich_king_tirion_dawn : public CreatureScript public: npc_the_lich_king_tirion_dawn() : CreatureScript("npc_the_lich_king_tirion_dawn") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_the_lich_king_tirion_dawnAI (pCreature); + return new npc_the_lich_king_tirion_dawnAI (creature); } struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI { - npc_the_lich_king_tirion_dawnAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); } + npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { Reset(); } void Reset() {} void AttackStart(Unit* /*who*/) {} // very sample, just don't make them aggreesive void UpdateAI(const uint32 /*diff*/) {} diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index 2bea5547a4d..e6cd684de6c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -28,9 +28,9 @@ class npc_valkyr_battle_maiden : public CreatureScript public: npc_valkyr_battle_maiden() : CreatureScript("npc_valkyr_battle_maiden") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_valkyr_battle_maidenAI (pCreature); + return new npc_valkyr_battle_maidenAI (creature); } struct npc_valkyr_battle_maidenAI : public PassiveAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 3ac8928f7b8..408aa8f5c8f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -42,9 +42,9 @@ class boss_arcanist_doan : public CreatureScript public: boss_arcanist_doan() : CreatureScript("boss_arcanist_doan") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_arcanist_doanAI (pCreature); + return new boss_arcanist_doanAI (creature); } struct boss_arcanist_doanAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index 04e525a3985..83a5b5808f4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -34,9 +34,9 @@ class boss_azshir_the_sleepless : public CreatureScript public: boss_azshir_the_sleepless() : CreatureScript("boss_azshir_the_sleepless") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_azshir_the_sleeplessAI (pCreature); + return new boss_azshir_the_sleeplessAI (creature); } struct boss_azshir_the_sleeplessAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index 852b21de423..16875dce85f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -42,9 +42,9 @@ class boss_bloodmage_thalnos : public CreatureScript public: boss_bloodmage_thalnos() : CreatureScript("boss_bloodmage_thalnos") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_bloodmage_thalnosAI (pCreature); + return new boss_bloodmage_thalnosAI (creature); } struct boss_bloodmage_thalnosAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index cf785a64301..13196ddea04 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -133,9 +133,9 @@ class mob_wisp_invis : public CreatureScript public: mob_wisp_invis() : CreatureScript("mob_wisp_invis") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_wisp_invisAI (pCreature); + return new mob_wisp_invisAI (creature); } struct mob_wisp_invisAI : public ScriptedAI @@ -220,9 +220,9 @@ class mob_head : public CreatureScript public: mob_head() : CreatureScript("mob_head") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_headAI (pCreature); + return new mob_headAI (creature); } struct mob_headAI : public ScriptedAI @@ -359,9 +359,9 @@ class boss_headless_horseman : public CreatureScript public: boss_headless_horseman() : CreatureScript("boss_headless_horseman") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_headless_horsemanAI (pCreature); + return new boss_headless_horsemanAI (creature); } struct boss_headless_horsemanAI : public ScriptedAI @@ -748,9 +748,9 @@ class mob_pulsing_pumpkin : public CreatureScript public: mob_pulsing_pumpkin() : CreatureScript("mob_pulsing_pumpkin") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_pulsing_pumpkinAI (pCreature); + return new mob_pulsing_pumpkinAI (creature); } struct mob_pulsing_pumpkinAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 6950f312f90..bb2fea6a1a7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -45,9 +45,9 @@ class boss_herod : public CreatureScript public: boss_herod() : CreatureScript("boss_herod") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_herodAI(pCreature); + return new boss_herodAI(creature); } struct boss_herodAI : public ScriptedAI @@ -123,9 +123,9 @@ class mob_scarlet_trainee : public CreatureScript public: mob_scarlet_trainee() : CreatureScript("mob_scarlet_trainee") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_scarlet_traineeAI(pCreature); + return new mob_scarlet_traineeAI(creature); } struct mob_scarlet_traineeAI : public npc_escortAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index ddbbd43b1d0..665cfa54f1e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -40,9 +40,9 @@ class boss_high_inquisitor_fairbanks : public CreatureScript public: boss_high_inquisitor_fairbanks() : CreatureScript("boss_high_inquisitor_fairbanks") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_high_inquisitor_fairbanksAI (pCreature); + return new boss_high_inquisitor_fairbanksAI (creature); } struct boss_high_inquisitor_fairbanksAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 351b0681423..8b0f793d2df 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -37,9 +37,9 @@ class boss_houndmaster_loksey : public CreatureScript public: boss_houndmaster_loksey() : CreatureScript("boss_houndmaster_loksey") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_houndmaster_lokseyAI (pCreature); + return new boss_houndmaster_lokseyAI (creature); } struct boss_houndmaster_lokseyAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index d369cd8b247..bb857f8362b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -42,9 +42,9 @@ class boss_interrogator_vishas : public CreatureScript public: boss_interrogator_vishas() : CreatureScript("boss_interrogator_vishas") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_interrogator_vishasAI (pCreature); + return new boss_interrogator_vishasAI (creature); } struct boss_interrogator_vishasAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index fd44a9bfe54..647ebdda0fe 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -58,16 +58,16 @@ class boss_scarlet_commander_mograine : public CreatureScript public: boss_scarlet_commander_mograine() : CreatureScript("boss_scarlet_commander_mograine") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_scarlet_commander_mograineAI (pCreature); + return new boss_scarlet_commander_mograineAI (creature); } struct boss_scarlet_commander_mograineAI : public ScriptedAI { - boss_scarlet_commander_mograineAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_scarlet_commander_mograineAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -223,16 +223,16 @@ class boss_high_inquisitor_whitemane : public CreatureScript public: boss_high_inquisitor_whitemane() : CreatureScript("boss_high_inquisitor_whitemane") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_high_inquisitor_whitemaneAI (pCreature); + return new boss_high_inquisitor_whitemaneAI (creature); } struct boss_high_inquisitor_whitemaneAI : public ScriptedAI { - boss_high_inquisitor_whitemaneAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_high_inquisitor_whitemaneAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index 5b025a7c579..7ee479727ed 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -35,9 +35,9 @@ class boss_scorn : public CreatureScript public: boss_scorn() : CreatureScript("boss_scorn") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_scornAI (pCreature); + return new boss_scornAI (creature); } struct boss_scornAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 96ebeef1a0e..34988e063ff 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -55,9 +55,9 @@ class boss_darkmaster_gandling : public CreatureScript public: boss_darkmaster_gandling() : CreatureScript("boss_darkmaster_gandling") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_darkmaster_gandlingAI (pCreature); + return new boss_darkmaster_gandlingAI (creature); } struct boss_darkmaster_gandlingAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp index e11ed41024b..4c66c129893 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp @@ -30,9 +30,9 @@ class boss_death_knight_darkreaver : public CreatureScript public: boss_death_knight_darkreaver() : CreatureScript("boss_death_knight_darkreaver") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_death_knight_darkreaverAI (pCreature); + return new boss_death_knight_darkreaverAI (creature); } struct boss_death_knight_darkreaverAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index a11e37d4321..c1cb60f6761 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -38,9 +38,9 @@ class boss_doctor_theolen_krastinov : public CreatureScript public: boss_doctor_theolen_krastinov() : CreatureScript("boss_doctor_theolen_krastinov") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_theolenkrastinovAI (pCreature); + return new boss_theolenkrastinovAI (creature); } struct boss_theolenkrastinovAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 858a829854b..dcd8e4940a1 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -36,9 +36,9 @@ class boss_illucia_barov : public CreatureScript public: boss_illucia_barov() : CreatureScript("boss_illucia_barov") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_illuciabarovAI (pCreature); + return new boss_illuciabarovAI (creature); } struct boss_illuciabarovAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 24e064a5752..9ca1a12bb02 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -37,9 +37,9 @@ class boss_instructor_malicia : public CreatureScript public: boss_instructor_malicia() : CreatureScript("boss_instructor_malicia") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_instructormaliciaAI (pCreature); + return new boss_instructormaliciaAI (creature); } struct boss_instructormaliciaAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 26b944fc7a5..f485b81072f 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -36,9 +36,9 @@ class boss_jandice_barov : public CreatureScript public: boss_jandice_barov() : CreatureScript("boss_jandice_barov") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_jandicebarovAI (pCreature); + return new boss_jandicebarovAI (creature); } struct boss_jandicebarovAI : public ScriptedAI @@ -158,9 +158,9 @@ class mob_illusionofjandicebarov : public CreatureScript public: mob_illusionofjandicebarov() : CreatureScript("mob_illusionofjandicebarov") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_illusionofjandicebarovAI (pCreature); + return new mob_illusionofjandicebarovAI (creature); } struct mob_illusionofjandicebarovAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index 311a32d9a54..72685d29181 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -33,9 +33,9 @@ class boss_kormok : public CreatureScript public: boss_kormok() : CreatureScript("boss_kormok") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kormokAI (pCreature); + return new boss_kormokAI (creature); } struct boss_kormokAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index c2875fbedc5..ae2550886b9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -34,9 +34,9 @@ class boss_lord_alexei_barov : public CreatureScript public: boss_lord_alexei_barov() : CreatureScript("boss_lord_alexei_barov") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lordalexeibarovAI (pCreature); + return new boss_lordalexeibarovAI (creature); } struct boss_lordalexeibarovAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index 6f7814e3481..d23eee99bb9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -36,9 +36,9 @@ class boss_lorekeeper_polkelt : public CreatureScript public: boss_lorekeeper_polkelt() : CreatureScript("boss_lorekeeper_polkelt") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lorekeeperpolkeltAI (pCreature); + return new boss_lorekeeperpolkeltAI (creature); } struct boss_lorekeeperpolkeltAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 75ac2ac8e6b..026bbbae5b1 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -37,9 +37,9 @@ class boss_boss_ras_frostwhisper : public CreatureScript public: boss_boss_ras_frostwhisper() : CreatureScript("boss_boss_ras_frostwhisper") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_rasfrostAI (pCreature); + return new boss_rasfrostAI (creature); } struct boss_rasfrostAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 3afe86dc9c9..e69fa65a00e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -36,9 +36,9 @@ class boss_the_ravenian : public CreatureScript public: boss_the_ravenian() : CreatureScript("boss_the_ravenian") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_theravenianAI (pCreature); + return new boss_theravenianAI (creature); } struct boss_theravenianAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 5c8bd795669..3512e4cd1cf 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -38,9 +38,9 @@ class boss_vectus : public CreatureScript public: boss_vectus() : CreatureScript("boss_vectus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_vectusAI (pCreature); + return new boss_vectusAI (creature); } struct boss_vectusAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 0a003e39fdb..5cd30dea384 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -58,32 +58,32 @@ class npc_shadowfang_prisoner : public CreatureScript public: npc_shadowfang_prisoner() : CreatureScript("npc_shadowfang_prisoner") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_shadowfang_prisonerAI(pCreature); + return new npc_shadowfang_prisonerAI(creature); } - 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 (npc_escortAI* pEscortAI = CAST_AI(npc_shadowfang_prisoner::npc_shadowfang_prisonerAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_shadowfang_prisoner::npc_shadowfang_prisonerAI, creature->AI())) pEscortAI->Start(false, false); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - InstanceScript* pInstance = pCreature->GetInstanceScript(); + InstanceScript* pInstance = creature->GetInstanceScript(); if (pInstance && pInstance->GetData(TYPE_FREE_NPC) != DONE && pInstance->GetData(TYPE_RETHILGORE) == DONE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DOOR, 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; } @@ -146,16 +146,16 @@ class npc_arugal_voidwalker : public CreatureScript public: npc_arugal_voidwalker() : CreatureScript("npc_arugal_voidwalker") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_arugal_voidwalkerAI(pCreature); + return new npc_arugal_voidwalkerAI(creature); } struct npc_arugal_voidwalkerAI : public ScriptedAI { - npc_arugal_voidwalkerAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_arugal_voidwalkerAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 5165291ce4c..b3885f796fe 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -82,9 +82,9 @@ class boss_baron_rivendare : public CreatureScript public: boss_baron_rivendare() : CreatureScript("boss_baron_rivendare") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_baron_rivendareAI (pCreature); + return new boss_baron_rivendareAI (creature); } struct boss_baron_rivendareAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 85818ecbe69..58e8a0813ed 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -36,9 +36,9 @@ class boss_baroness_anastari : public CreatureScript public: boss_baroness_anastari() : CreatureScript("boss_baroness_anastari") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_baroness_anastariAI (pCreature); + return new boss_baroness_anastariAI (creature); } struct boss_baroness_anastariAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 57293f18641..edf291a7c0e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -81,9 +81,9 @@ class boss_cannon_master_willey : public CreatureScript public: boss_cannon_master_willey() : CreatureScript("boss_cannon_master_willey") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_cannon_master_willeyAI (pCreature); + return new boss_cannon_master_willeyAI (creature); } struct boss_cannon_master_willeyAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index f6a6639264b..c1033a2fdb9 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -70,9 +70,9 @@ class boss_dathrohan_balnazzar : public CreatureScript public: boss_dathrohan_balnazzar() : CreatureScript("boss_dathrohan_balnazzar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_dathrohan_balnazzarAI (pCreature); + return new boss_dathrohan_balnazzarAI (creature); } struct boss_dathrohan_balnazzarAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index 1388547c26b..1a4acf9be7e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -39,9 +39,9 @@ class boss_magistrate_barthilas : public CreatureScript public: boss_magistrate_barthilas() : CreatureScript("boss_magistrate_barthilas") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_magistrate_barthilasAI (pCreature); + return new boss_magistrate_barthilasAI (creature); } struct boss_magistrate_barthilasAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 8056a1d13bd..521348dd0db 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -36,9 +36,9 @@ class boss_maleki_the_pallid : public CreatureScript public: boss_maleki_the_pallid() : CreatureScript("boss_maleki_the_pallid") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_maleki_the_pallidAI (pCreature); + return new boss_maleki_the_pallidAI (creature); } struct boss_maleki_the_pallidAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 6e18eda0768..963149022c8 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -36,9 +36,9 @@ class boss_nerubenkan : public CreatureScript public: boss_nerubenkan() : CreatureScript("boss_nerubenkan") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_nerubenkanAI (pCreature); + return new boss_nerubenkanAI (creature); } struct boss_nerubenkanAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp index 2427cac6bcb..fac45e5ffaa 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp @@ -47,9 +47,9 @@ class boss_silver_hand_bosses : public CreatureScript public: boss_silver_hand_bosses() : CreatureScript("boss_silver_hand_bosses") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_silver_hand_bossesAI (pCreature); + return new boss_silver_hand_bossesAI (creature); } struct boss_silver_hand_bossesAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index 43aaccbeda6..f6d6ae377e4 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -41,9 +41,9 @@ class boss_postmaster_malown : public CreatureScript public: boss_postmaster_malown() : CreatureScript("boss_postmaster_malown") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_postmaster_malownAI (pCreature); + return new boss_postmaster_malownAI (creature); } struct boss_postmaster_malownAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index b53c77acac5..aa9ba7b74b3 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -36,9 +36,9 @@ class boss_ramstein_the_gorger : public CreatureScript public: boss_ramstein_the_gorger() : CreatureScript("boss_ramstein_the_gorger") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ramstein_the_gorgerAI (pCreature); + return new boss_ramstein_the_gorgerAI (creature); } struct boss_ramstein_the_gorgerAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index 7637d9bf60b..96e313dc6a2 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -34,9 +34,9 @@ class boss_timmy_the_cruel : public CreatureScript public: boss_timmy_the_cruel() : CreatureScript("boss_timmy_the_cruel") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_timmy_the_cruelAI (pCreature); + return new boss_timmy_the_cruelAI (creature); } struct boss_timmy_the_cruelAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 01535bbae55..af7ebb1c919 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -92,9 +92,9 @@ class mob_freed_soul : public CreatureScript public: mob_freed_soul() : CreatureScript("mob_freed_soul") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_freed_soulAI (pCreature); + return new mob_freed_soulAI (creature); } struct mob_freed_soulAI : public ScriptedAI @@ -126,9 +126,9 @@ class mob_restless_soul : public CreatureScript public: mob_restless_soul() : CreatureScript("mob_restless_soul") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_restless_soulAI (pCreature); + return new mob_restless_soulAI (creature); } struct mob_restless_soulAI : public ScriptedAI @@ -204,9 +204,9 @@ class mobs_spectral_ghostly_citizen : public CreatureScript public: mobs_spectral_ghostly_citizen() : CreatureScript("mobs_spectral_ghostly_citizen") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mobs_spectral_ghostly_citizenAI (pCreature); + return new mobs_spectral_ghostly_citizenAI (creature); } struct mobs_spectral_ghostly_citizenAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 2903fb34c53..9ad5faff5b6 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -71,9 +71,9 @@ class boss_brutallus : public CreatureScript public: boss_brutallus() : CreatureScript("boss_brutallus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_brutallusAI (pCreature); + return new boss_brutallusAI (creature); } struct boss_brutallusAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index e1b2f087462..64bcf1b3ec4 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -90,9 +90,9 @@ class boss_sacrolash : public CreatureScript public: boss_sacrolash() : CreatureScript("boss_sacrolash") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_sacrolashAI (pCreature); + return new boss_sacrolashAI (creature); }; struct boss_sacrolashAI : public ScriptedAI @@ -348,9 +348,9 @@ class boss_alythess : public CreatureScript public: boss_alythess() : CreatureScript("boss_alythess") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_alythessAI (pCreature); + return new boss_alythessAI (creature); }; struct boss_alythessAI : public Scripted_NoMovementAI @@ -678,9 +678,9 @@ class mob_shadow_image : public CreatureScript public: mob_shadow_image() : CreatureScript("mob_shadow_image") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_shadow_imageAI (pCreature); + return new mob_shadow_imageAI (creature); }; struct mob_shadow_imageAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index e7e9d95e19a..efa8a341b81 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -108,9 +108,9 @@ class boss_felmyst : public CreatureScript public: boss_felmyst() : CreatureScript("boss_felmyst") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_felmystAI(pCreature); + return new boss_felmystAI(creature); } struct boss_felmystAI : public ScriptedAI @@ -527,9 +527,9 @@ class mob_felmyst_vapor : public CreatureScript public: mob_felmyst_vapor() : CreatureScript("mob_felmyst_vapor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_felmyst_vaporAI(pCreature); + return new mob_felmyst_vaporAI(creature); } struct mob_felmyst_vaporAI : public ScriptedAI @@ -560,9 +560,9 @@ class mob_felmyst_trail : public CreatureScript public: mob_felmyst_trail() : CreatureScript("mob_felmyst_trail") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_felmyst_trailAI(pCreature); + return new mob_felmyst_trailAI(creature); } struct mob_felmyst_trailAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 7bea5943981..976433e69a9 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -108,9 +108,9 @@ class boss_kalecgos : public CreatureScript public: boss_kalecgos() : CreatureScript("boss_kalecgos") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kalecgosAI (pCreature); + return new boss_kalecgosAI (creature); } struct boss_kalecgosAI : public ScriptedAI @@ -441,9 +441,9 @@ class boss_kalec : public CreatureScript public: boss_kalec() : CreatureScript("boss_kalec") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kalecAI (pCreature); + return new boss_kalecAI (creature); } struct boss_kalecAI : public ScriptedAI @@ -571,9 +571,9 @@ class boss_sathrovarr : public CreatureScript public: boss_sathrovarr() : CreatureScript("boss_sathrovarr") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_sathrovarrAI (pCreature); + return new boss_sathrovarrAI (creature); } struct boss_sathrovarrAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 8588c81ecd6..6c120ee8590 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -210,7 +210,7 @@ float ShieldOrbLocations[4][2]= struct Speech { int32 textid; - uint32 pCreature, timer; + uint32 creature, timer; }; // Timers @@ -244,9 +244,9 @@ class boss_kalecgos_kj : public CreatureScript public: boss_kalecgos_kj() : CreatureScript("boss_kalecgos_kj") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kalecgos_kjAI (pCreature); + return new boss_kalecgos_kjAI (creature); } struct boss_kalecgos_kjAI : public ScriptedAI @@ -399,9 +399,9 @@ class mob_kiljaeden_controller : public CreatureScript public: mob_kiljaeden_controller() : CreatureScript("mob_kiljaeden_controller") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_kiljaeden_controllerAI (pCreature); + return new mob_kiljaeden_controllerAI (creature); } struct mob_kiljaeden_controllerAI : public Scripted_NoMovementAI @@ -499,9 +499,9 @@ class boss_kiljaeden : public CreatureScript public: boss_kiljaeden() : CreatureScript("boss_kiljaeden") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kiljaedenAI (pCreature); + return new boss_kiljaedenAI (creature); } struct boss_kiljaedenAI : public Scripted_NoMovementAI @@ -723,7 +723,7 @@ public: { SpeechTimer = 0; if (pInstance) - if (Creature* pSpeechCreature = Unit::GetCreature(*me, pInstance->GetData64(Speeches[speechCount].pCreature))) + if (Creature* pSpeechCreature = Unit::GetCreature(*me, pInstance->GetData64(Speeches[speechCount].creature))) DoScriptText(Speeches[speechCount].textid, pSpeechCreature); if (speechCount == 12) if (Creature* pAnveena = Unit::GetCreature(*me, pInstance->GetData64(DATA_ANVEENA))) @@ -913,9 +913,9 @@ class mob_hand_of_the_deceiver : public CreatureScript public: mob_hand_of_the_deceiver() : CreatureScript("mob_hand_of_the_deceiver") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_hand_of_the_deceiverAI (pCreature); + return new mob_hand_of_the_deceiverAI (creature); } struct mob_hand_of_the_deceiverAI : public ScriptedAI @@ -1014,9 +1014,9 @@ class mob_felfire_portal : public CreatureScript public: mob_felfire_portal() : CreatureScript("mob_felfire_portal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_felfire_portalAI (pCreature); + return new mob_felfire_portalAI (creature); } struct mob_felfire_portalAI : public Scripted_NoMovementAI @@ -1059,9 +1059,9 @@ class mob_volatile_felfire_fiend : public CreatureScript public: mob_volatile_felfire_fiend() : CreatureScript("mob_volatile_felfire_fiend") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_volatile_felfire_fiendAI (pCreature); + return new mob_volatile_felfire_fiendAI (creature); } struct mob_volatile_felfire_fiendAI : public ScriptedAI @@ -1117,9 +1117,9 @@ class mob_armageddon : public CreatureScript public: mob_armageddon() : CreatureScript("mob_armageddon") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_armageddonAI (pCreature); + return new mob_armageddonAI (creature); } struct mob_armageddonAI : public Scripted_NoMovementAI @@ -1172,9 +1172,9 @@ class mob_shield_orb : public CreatureScript public: mob_shield_orb() : CreatureScript("mob_shield_orb") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_shield_orbAI (pCreature); + return new mob_shield_orbAI (creature); } struct mob_shield_orbAI : public ScriptedAI @@ -1260,9 +1260,9 @@ class mob_sinster_reflection : public CreatureScript public: mob_sinster_reflection() : CreatureScript("mob_sinster_reflection") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_sinster_reflectionAI (pCreature); + return new mob_sinster_reflectionAI (creature); } struct mob_sinster_reflectionAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 5f95128b64a..cc9cb6bfa35 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -106,9 +106,9 @@ class boss_entropius : public CreatureScript public: boss_entropius() : CreatureScript("boss_entropius") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_entropiusAI (pCreature); + return new boss_entropiusAI (creature); } struct boss_entropiusAI : public ScriptedAI @@ -206,9 +206,9 @@ class boss_muru : public CreatureScript public: boss_muru() : CreatureScript("boss_muru") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_muruAI (pCreature); + return new boss_muruAI (creature); } struct boss_muruAI : public Scripted_NoMovementAI @@ -371,9 +371,9 @@ class npc_muru_portal : public CreatureScript public: npc_muru_portal() : CreatureScript("npc_muru_portal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_muru_portalAI (pCreature); + return new npc_muru_portalAI (creature); } struct npc_muru_portalAI : public Scripted_NoMovementAI @@ -455,9 +455,9 @@ class npc_dark_fiend : public CreatureScript public: npc_dark_fiend() : CreatureScript("npc_dark_fiend") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_dark_fiendAI (pCreature); + return new npc_dark_fiendAI (creature); } struct npc_dark_fiendAI : public ScriptedAI @@ -518,9 +518,9 @@ class npc_void_sentinel : public CreatureScript public: npc_void_sentinel() : CreatureScript("npc_void_sentinel") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_void_sentinelAI (pCreature); + return new npc_void_sentinelAI (creature); } struct npc_void_sentinelAI : public ScriptedAI @@ -574,9 +574,9 @@ class npc_blackhole : public CreatureScript public: npc_blackhole() : CreatureScript("npc_blackhole") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_blackholeAI (pCreature); + return new npc_blackholeAI (creature); } struct npc_blackholeAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 16eabd71512..6be9082be70 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -63,7 +63,7 @@ class boss_archaedas : public CreatureScript struct boss_archaedasAI : public ScriptedAI { - boss_archaedasAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_archaedasAI(Creature* creature) : ScriptedAI(creature) { pInstance = me->GetInstanceScript(); } @@ -331,7 +331,7 @@ class mob_stonekeepers : public CreatureScript struct mob_stonekeepersAI : public ScriptedAI { - mob_stonekeepersAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_stonekeepersAI(Creature* creature) : ScriptedAI(creature) { pInstance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp index f3cc42fcf47..89c35cf6e71 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp @@ -42,7 +42,7 @@ class boss_ironaya : public CreatureScript struct boss_ironayaAI : public ScriptedAI { - boss_ironayaAI(Creature* pCreature) : ScriptedAI(pCreature) {} + boss_ironayaAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiArcingTimer; bool bHasCastedWstomp; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index efb14fc8c49..0a7127772e3 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -53,7 +53,7 @@ class mob_jadespine_basilisk : public CreatureScript struct mob_jadespine_basiliskAI : public ScriptedAI { - mob_jadespine_basiliskAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_jadespine_basiliskAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiCslumberTimer; @@ -173,80 +173,80 @@ class npc_lore_keeper_of_norgannon : public CreatureScript { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(2278) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_KEEPER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(1079, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1079, 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(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(1080, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1080, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(1081, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1081, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(1082, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1082, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(1083, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1083, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(1084, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1084, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - pPlayer->SEND_GOSSIP_MENU(1085, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1085, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8); - pPlayer->SEND_GOSSIP_MENU(1086, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1086, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+8: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); - pPlayer->SEND_GOSSIP_MENU(1087, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1087, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+9: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10); - pPlayer->SEND_GOSSIP_MENU(1088, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1088, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+11); - pPlayer->SEND_GOSSIP_MENU(1089, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1089, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+12); - pPlayer->SEND_GOSSIP_MENU(1090, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1090, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+12: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+13); - pPlayer->SEND_GOSSIP_MENU(1091, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1091, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+13: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+14); - pPlayer->SEND_GOSSIP_MENU(1092, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1092, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+14: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+15); - pPlayer->SEND_GOSSIP_MENU(1093, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1093, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+15: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+16); - pPlayer->SEND_GOSSIP_MENU(1094, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1094, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+16: pPlayer->CLOSE_GOSSIP_MENU(); 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; } } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 6f86b9677a3..33e2786433c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -59,9 +59,9 @@ class boss_arlokk : public CreatureScript struct boss_arlokkAI : public ScriptedAI { - boss_arlokkAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_arlokkAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/blasted_lands.cpp b/src/server/scripts/EasternKingdoms/blasted_lands.cpp index 8cd3237360d..cf4043a61fa 100644 --- a/src/server/scripts/EasternKingdoms/blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/blasted_lands.cpp @@ -45,24 +45,24 @@ class npc_deathly_usher : public CreatureScript public: npc_deathly_usher() : CreatureScript("npc_deathly_usher") { } - 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) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true); + creature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(10757, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -88,49 +88,49 @@ class npc_fallen_hero_of_horde : public CreatureScript public: npc_fallen_hero_of_horde() : CreatureScript("npc_fallen_hero_of_horde") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(1392, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1392, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: - pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1411, creature->GetGUID()); if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE) pPlayer->AreaExploredOrEventHappens(2784); if (pPlayer->GetTeam() == ALLIANCE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1411, creature->GetGUID()); } break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); - pPlayer->SEND_GOSSIP_MENU(1451, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1451, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+21: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); - pPlayer->SEND_GOSSIP_MENU(1452, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1452, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+22: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); - pPlayer->SEND_GOSSIP_MENU(1453, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1453, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+23: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); - pPlayer->SEND_GOSSIP_MENU(1454, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1454, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+24: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25); - pPlayer->SEND_GOSSIP_MENU(1455, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1455, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+25: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26); - pPlayer->SEND_GOSSIP_MENU(1456, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1456, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+26: pPlayer->CLOSE_GOSSIP_MENU(); @@ -140,10 +140,10 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -154,7 +154,7 @@ public: if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, 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; } diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index 1cc110d3eb7..7b328f57fc8 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -38,9 +38,9 @@ class boss_kruul : public CreatureScript public: boss_kruul() : CreatureScript("boss_kruul") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kruulAI (pCreature); + return new boss_kruulAI (creature); } struct boss_kruulAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp index 6e517937cb0..43d35631b45 100644 --- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp @@ -51,54 +51,54 @@ class npc_ragged_john : public CreatureScript public: npc_ragged_john() : CreatureScript("npc_ragged_john") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2714, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2714, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(2715, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2715, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(2716, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2716, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(2717, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2717, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(2718, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2718, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(2719, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2719, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(2720, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2720, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8); - pPlayer->SEND_GOSSIP_MENU(2721, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2721, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+8: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); - pPlayer->SEND_GOSSIP_MENU(2722, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2722, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+9: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); - pPlayer->SEND_GOSSIP_MENU(2723, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2723, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(2725, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2725, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: pPlayer->CLOSE_GOSSIP_MENU(); @@ -108,21 +108,21 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(2713, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2713, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_ragged_johnAI (pCreature); + return new npc_ragged_johnAI (creature); } struct npc_ragged_johnAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 9e2fd198df2..65c2c9abce0 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -68,9 +68,9 @@ class boss_twilight_corrupter : public CreatureScript public: boss_twilight_corrupter() : CreatureScript("boss_twilight_corrupter") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_twilight_corrupterAI (pCreature); + return new boss_twilight_corrupterAI (creature); } struct boss_twilight_corrupterAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp index ce07f3bbd7a..ab31ebcba6a 100644 --- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp @@ -41,9 +41,9 @@ class mobs_ghoul_flayer : public CreatureScript public: mobs_ghoul_flayer() : CreatureScript("mobs_ghoul_flayer") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mobs_ghoul_flayerAI (pCreature); + return new mobs_ghoul_flayerAI (creature); } struct mobs_ghoul_flayerAI : public ScriptedAI @@ -72,23 +72,23 @@ class npc_augustus_the_touched : public CreatureScript public: npc_augustus_the_touched() : CreatureScript("npc_augustus_the_touched") { } - 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_TRADE) - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(creature->GetGUID()); return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); - if (pCreature->isVendor() && pPlayer->GetQuestRewardStatus(6164)) + if (creature->isVendor() && pPlayer->GetQuestRewardStatus(6164)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -105,17 +105,17 @@ class npc_darrowshire_spirit : public CreatureScript public: npc_darrowshire_spirit() : CreatureScript("npc_darrowshire_spirit") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - pPlayer->SEND_GOSSIP_MENU(3873, pCreature->GetGUID()); - pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pPlayer->SEND_GOSSIP_MENU(3873, creature->GetGUID()); + pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_darrowshire_spiritAI (pCreature); + return new npc_darrowshire_spiritAI (creature); } struct npc_darrowshire_spiritAI : public ScriptedAI @@ -148,22 +148,22 @@ class npc_tirion_fordring : public CreatureScript public: npc_tirion_fordring() : CreatureScript("npc_tirion_fordring") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(4493, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4493, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(4494, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4494, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(4495, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4495, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); @@ -173,15 +173,15 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && pPlayer->getStandState() == UNIT_STAND_STATE_SIT) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, 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; } diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index aaf226474e1..271a08c6f10 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -53,36 +53,36 @@ class npc_prospector_anvilward : public CreatureScript public: npc_prospector_anvilward() : CreatureScript("npc_prospector_anvilward") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(8240, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8240, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); - if (npc_escortAI* pEscortAI = CAST_AI(npc_prospector_anvilward::npc_prospector_anvilwardAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_prospector_anvilward::npc_prospector_anvilwardAI, creature->AI())) pEscortAI->Start(true, false, pPlayer->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(8239, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8239, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_prospector_anvilwardAI(pCreature); + return new npc_prospector_anvilwardAI(creature); } struct npc_prospector_anvilwardAI : public npc_escortAI @@ -184,14 +184,14 @@ class npc_second_trial_paladin : public CreatureScript public: npc_second_trial_paladin() : CreatureScript("npc_second_trial_paladin") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_secondTrialAI (pCreature); + return new npc_secondTrialAI (creature); } struct npc_secondTrialAI : public ScriptedAI { - npc_secondTrialAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_secondTrialAI(Creature* creature) : ScriptedAI(creature) {} uint32 timer; uint8 questPhase; @@ -346,35 +346,35 @@ class npc_second_trial_controller : public CreatureScript public: npc_second_trial_controller() : CreatureScript("npc_second_trial_controller") { } - bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, Quest const *quest) + bool OnQuestAccept(Player* /*pPlayer*/, Creature* creature, Quest const *quest) { // One Player exclusive quest, wait for user go activation if (quest->GetQuestId() == QUEST_SECOND_TRIAL) - CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, pCreature->AI())->questPhase = 1; + CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, creature->AI())->questPhase = 1; return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { // quest only available if not already started // Quest_template flag is set to : QUEST_FLAGS_EVENT // Escort quests or any other event-driven quests. If player in party, all players that can accept this quest will receive confirmation box to accept quest. // !not sure if this really works! - if (CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, pCreature->AI())->questPhase == 0) + if (CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, creature->AI())->questPhase == 0) { - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - pPlayer->SendPreparedQuest(pCreature->GetGUID()); + pPlayer->PrepareQuestMenu(creature->GetGUID()); + pPlayer->SendPreparedQuest(creature->GetGUID()); } - pPlayer->SEND_GOSSIP_MENU(pCreature->GetEntry(), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(creature->GetEntry(), creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new master_kelerun_bloodmournAI (pCreature); + return new master_kelerun_bloodmournAI (creature); } struct master_kelerun_bloodmournAI : public ScriptedAI @@ -508,8 +508,8 @@ public: bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { // find spawn :: master_kelerun_bloodmourn - if (Creature* pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) - CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, pCreature->AI())->StartEvent(); + if (Creature* creature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) + CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, creature->AI())->StartEvent(); return true; } @@ -529,19 +529,19 @@ class npc_apprentice_mirveda : public CreatureScript public: npc_apprentice_mirveda() : CreatureScript("npc_apprentice_mirveda") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT) { - CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, pCreature->AI())->Summon = true; - CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, creature->AI())->Summon = true; + CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_apprentice_mirvedaAI (pCreature); + return new npc_apprentice_mirvedaAI (creature); } struct npc_apprentice_mirvedaAI : public ScriptedAI @@ -630,9 +630,9 @@ class npc_infused_crystal : public CreatureScript public: npc_infused_crystal() : CreatureScript("npc_infused_crystal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_infused_crystalAI (pCreature); + return new npc_infused_crystalAI (creature); } struct npc_infused_crystalAI : public Scripted_NoMovementAI diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 290d2f1b5ee..5d2104475e3 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -44,7 +44,7 @@ class npc_blood_knight_dawnstar : public CreatureScript public: npc_blood_knight_dawnstar() : CreatureScript("npc_blood_knight_dawnstar") { } - 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) @@ -60,12 +60,12 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226, 1, true)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, 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; } @@ -83,26 +83,26 @@ class npc_budd_nedreck : public CreatureScript public: npc_budd_nedreck() : CreatureScript("npc_budd_nedreck") { } - 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) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer, 42540, false); + creature->CastSpell(pPlayer, 42540, false); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -117,25 +117,25 @@ class npc_rathis_tomber : public CreatureScript public: npc_rathis_tomber() : CreatureScript("npc_rathis_tomber") { } - 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_TRADE) - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(creature->GetGUID()); return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); - if (pCreature->isVendor() && pPlayer->GetQuestRewardStatus(9152)) + if (creature->isVendor() && pPlayer->GetQuestRewardStatus(9152)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(8432, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8432, creature->GetGUID()); }else - pPlayer->SEND_GOSSIP_MENU(8431, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8431, creature->GetGUID()); return true; } @@ -234,21 +234,21 @@ public: } }; - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS) { - pCreature->setFaction(113); + creature->setFaction(113); - if (npc_escortAI* pEscortAI = CAST_AI(npc_ranger_lilatha::npc_ranger_lilathaAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_ranger_lilatha::npc_ranger_lilathaAI, creature->AI())) pEscortAI->Start(true, false, pPlayer->GetGUID()); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_ranger_lilathaAI(pCreature); + return new npc_ranger_lilathaAI(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index 75cf7d481a8..24e250562f6 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -57,33 +57,33 @@ class npc_00x09hl : public CreatureScript public: npc_00x09hl() : CreatureScript("npc_00x09hl") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_RESQUE_OOX_09) { - pCreature->SetStandState(UNIT_STAND_STATE_STAND); + creature->SetStandState(UNIT_STAND_STATE_STAND); if (pPlayer->GetTeam() == ALLIANCE) - pCreature->setFaction(FACTION_ESCORTEE_A); + creature->setFaction(FACTION_ESCORTEE_A); else if (pPlayer->GetTeam() == HORDE) - pCreature->setFaction(FACTION_ESCORTEE_H); + creature->setFaction(FACTION_ESCORTEE_H); - DoScriptText(SAY_OOX_START, pCreature, pPlayer); + DoScriptText(SAY_OOX_START, creature, pPlayer); - if (npc_00x09hlAI* pEscortAI = CAST_AI(npc_00x09hl::npc_00x09hlAI, pCreature->AI())) + if (npc_00x09hlAI* pEscortAI = CAST_AI(npc_00x09hl::npc_00x09hlAI, creature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_00x09hlAI(pCreature); + return new npc_00x09hlAI(creature); } struct npc_00x09hlAI : public npc_escortAI { - npc_00x09hlAI(Creature* pCreature) : npc_escortAI(pCreature) { } + npc_00x09hlAI(Creature* creature) : npc_escortAI(creature) { } void Reset() { } @@ -191,27 +191,27 @@ class npc_rinji : public CreatureScript public: npc_rinji() : CreatureScript("npc_rinji") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_RINJI_TRAPPED) { - if (GameObject* pGo = pCreature->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE)) + if (GameObject* pGo = creature->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE)) pGo->UseDoorOrButton(); - if (npc_rinjiAI* pEscortAI = CAST_AI(npc_rinji::npc_rinjiAI, pCreature->AI())) + if (npc_rinjiAI* pEscortAI = CAST_AI(npc_rinji::npc_rinjiAI, creature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_rinjiAI(pCreature); + return new npc_rinjiAI(creature); } struct npc_rinjiAI : public npc_escortAI { - npc_rinjiAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_rinjiAI(Creature* creature) : npc_escortAI(creature) { m_bIsByOutrunner = false; m_iSpawnId = 0; diff --git a/src/server/scripts/EasternKingdoms/ironforge.cpp b/src/server/scripts/EasternKingdoms/ironforge.cpp index 0c55076c3f2..b121c266733 100644 --- a/src/server/scripts/EasternKingdoms/ironforge.cpp +++ b/src/server/scripts/EasternKingdoms/ironforge.cpp @@ -44,26 +44,26 @@ class npc_royal_historian_archesonus : public CreatureScript public: npc_royal_historian_archesonus() : CreatureScript("npc_royal_historian_archesonus") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2236, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2236, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(2237, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2237, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(2238, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2238, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(2239, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2239, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); @@ -73,18 +73,18 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(3702) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(2235, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2235, creature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp index 31512dc6a37..7dc32e22e56 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp @@ -44,9 +44,9 @@ class npc_converted_sentry : public CreatureScript public: npc_converted_sentry() : CreatureScript("npc_converted_sentry") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_converted_sentryAI (pCreature); + return new npc_converted_sentryAI (creature); } struct npc_converted_sentryAI : public ScriptedAI @@ -102,9 +102,9 @@ class npc_greengill_slave : public CreatureScript public: npc_greengill_slave() : CreatureScript("npc_greengill_slave") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_greengill_slaveAI(pCreature); + return new npc_greengill_slaveAI(creature); } struct npc_greengill_slaveAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/loch_modan.cpp b/src/server/scripts/EasternKingdoms/loch_modan.cpp index 3ea335e83b8..d9d4dbe5e31 100644 --- a/src/server/scripts/EasternKingdoms/loch_modan.cpp +++ b/src/server/scripts/EasternKingdoms/loch_modan.cpp @@ -47,34 +47,34 @@ class npc_mountaineer_pebblebitty : public CreatureScript public: npc_mountaineer_pebblebitty() : CreatureScript("npc_mountaineer_pebblebitty") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1833, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1833, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(1834, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1834, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(1835, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1835, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(1836, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1836, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(1837, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1837, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(1838, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1838, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->CLOSE_GOSSIP_MENU(); @@ -83,15 +83,15 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (!pPlayer->GetQuestRewardStatus(3181) == 1) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP, 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; } diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index f104d104583..28badc9d384 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp @@ -43,25 +43,25 @@ class npc_corporal_keeshan : public CreatureScript public: npc_corporal_keeshan() : CreatureScript("npc_corporal_keeshan") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *pQuest) { if (pQuest->GetQuestId() == QUEST_MISSING_IN_ACTION) { - CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, pCreature->AI())->Start(true, false, pPlayer->GetGUID(), pQuest); - DoScriptText(SAY_CORPORAL_1, pCreature); + CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, creature->AI())->Start(true, false, pPlayer->GetGUID(), pQuest); + DoScriptText(SAY_CORPORAL_1, creature); } return false; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_corporal_keeshanAI(pCreature); + return new npc_corporal_keeshanAI(creature); } struct npc_corporal_keeshanAI : public npc_escortAI { - npc_corporal_keeshanAI(Creature* pCreature) : npc_escortAI(pCreature) {} + npc_corporal_keeshanAI(Creature* creature) : npc_escortAI(creature) {} uint32 uiPhase; uint32 uiTimer; diff --git a/src/server/scripts/EasternKingdoms/searing_gorge.cpp b/src/server/scripts/EasternKingdoms/searing_gorge.cpp index c4c9a7d0d07..fc017998c3a 100644 --- a/src/server/scripts/EasternKingdoms/searing_gorge.cpp +++ b/src/server/scripts/EasternKingdoms/searing_gorge.cpp @@ -44,18 +44,18 @@ class npc_kalaran_windblade : public CreatureScript public: npc_kalaran_windblade() : CreatureScript("npc_kalaran_windblade") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(1954, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1954, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1955, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1955, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); @@ -65,15 +65,15 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(3441) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_KW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -91,7 +91,7 @@ class npc_lothos_riftwaker : public CreatureScript public: npc_lothos_riftwaker() : CreatureScript("npc_lothos_riftwaker") { } - 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) @@ -103,15 +103,15 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestRewardStatus(7487) || pPlayer->GetQuestRewardStatus(7848)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LR, 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; } @@ -131,18 +131,18 @@ class npc_zamael_lunthistle : public CreatureScript public: npc_zamael_lunthistle() : CreatureScript("npc_zamael_lunthistle") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_ZL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(1921, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1921, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_ZL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1922, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1922, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); @@ -152,15 +152,15 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(3377) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ZL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(1920, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1920, creature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp index 36f26a957d1..7fb230dcc07 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp @@ -46,9 +46,9 @@ class npc_blood_knight_stillblade : public CreatureScript public: npc_blood_knight_stillblade() : CreatureScript("npc_blood_knight_stillblade") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_blood_knight_stillbladeAI (pCreature); + return new npc_blood_knight_stillbladeAI (creature); } struct npc_blood_knight_stillbladeAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 0d02499d9c0..2e732f3d7a4 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -44,36 +44,36 @@ class npc_astor_hadren : public CreatureScript public: npc_astor_hadren() : CreatureScript("npc_astor_hadren") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_astor_hadrenAI(pCreature); + return new npc_astor_hadrenAI(creature); } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(624, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(624, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->setFaction(21); + creature->setFaction(21); if (pPlayer) - CAST_AI(npc_astor_hadren::npc_astor_hadrenAI, pCreature->AI())->AttackStart(pPlayer); + CAST_AI(npc_astor_hadren::npc_astor_hadrenAI, creature->AI())->AttackStart(pPlayer); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(1886) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(623, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(623, creature->GetGUID()); return true; } @@ -174,22 +174,22 @@ public: } }; - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_ESCORTING) { - DoScriptText(SAY_QUESTACCEPT, pCreature, pPlayer); + DoScriptText(SAY_QUESTACCEPT, creature, pPlayer); - if (npc_escortAI* pEscortAI = CAST_AI(npc_deathstalker_erland::npc_deathstalker_erlandAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_deathstalker_erland::npc_deathstalker_erlandAI, creature->AI())) pEscortAI->Start(true, false, pPlayer->GetGUID()); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_deathstalker_erlandAI(pCreature); + return new npc_deathstalker_erlandAI(creature); } }; @@ -225,22 +225,22 @@ class pyrewood_ambush : public CreatureScript public: pyrewood_ambush() : CreatureScript("pyrewood_ambush") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest *pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest *pQuest) { - if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, pCreature->AI())->QuestInProgress) + if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress) { - CAST_AI(pyrewood_ambush::pyrewood_ambushAI, pCreature->AI())->QuestInProgress = true; - CAST_AI(pyrewood_ambush::pyrewood_ambushAI, pCreature->AI())->Phase = 0; - CAST_AI(pyrewood_ambush::pyrewood_ambushAI, pCreature->AI())->KillCount = 0; - CAST_AI(pyrewood_ambush::pyrewood_ambushAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress = true; + CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->Phase = 0; + CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->KillCount = 0; + CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new pyrewood_ambushAI (pCreature); + return new pyrewood_ambushAI (creature); } struct pyrewood_ambushAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index eb52472fafd..4aa3c56438d 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -48,27 +48,27 @@ class npc_archmage_malin : public CreatureScript public: npc_archmage_malin() : CreatureScript("npc_archmage_malin") { } - 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) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer, 42711, true); + creature->CastSpell(pPlayer, 42711, true); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(11223) == QUEST_STATUS_COMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MALIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -90,19 +90,19 @@ class npc_bartleby : public CreatureScript public: npc_bartleby() : CreatureScript("npc_bartleby") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) { if (pQuest->GetQuestId() == QUEST_BEAT) { - pCreature->setFaction(FACTION_ENEMY); - pCreature->AI()->AttackStart(pPlayer); + creature->setFaction(FACTION_ENEMY); + creature->AI()->AttackStart(pPlayer); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_bartlebyAI(pCreature); + return new npc_bartlebyAI(creature); } struct npc_bartlebyAI : public ScriptedAI @@ -162,19 +162,19 @@ class npc_dashel_stonefist : public CreatureScript public: npc_dashel_stonefist() : CreatureScript("npc_dashel_stonefist") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) { if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT8) { - pCreature->setFaction(FACTION_HOSTILE); - CAST_AI(npc_dashel_stonefist::npc_dashel_stonefistAI, pCreature->AI())->AttackStart(pPlayer); + creature->setFaction(FACTION_HOSTILE); + CAST_AI(npc_dashel_stonefist::npc_dashel_stonefistAI, creature->AI())->AttackStart(pPlayer); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_dashel_stonefistAI(pCreature); + return new npc_dashel_stonefistAI(creature); } struct npc_dashel_stonefistAI : public ScriptedAI @@ -233,22 +233,22 @@ class npc_lady_katrana_prestor : public CreatureScript public: npc_lady_katrana_prestor() : CreatureScript("npc_lady_katrana_prestor") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2694, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2694, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(2695, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2695, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(2696, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2696, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); @@ -258,15 +258,15 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(2693, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2693, creature->GetGUID()); return true; } @@ -299,16 +299,16 @@ class npc_lord_gregor_lescovar : public CreatureScript public: npc_lord_gregor_lescovar() : CreatureScript("npc_lord_gregor_lescovar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_lord_gregor_lescovarAI(pCreature); + return new npc_lord_gregor_lescovarAI(creature); } struct npc_lord_gregor_lescovarAI : public npc_escortAI { - npc_lord_gregor_lescovarAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_lord_gregor_lescovarAI(Creature* creature) : npc_escortAI(creature) { - pCreature->RestoreFaction(); + creature->RestoreFaction(); } uint32 uiTimer; @@ -455,14 +455,14 @@ class npc_marzon_silent_blade : public CreatureScript public: npc_marzon_silent_blade() : CreatureScript("npc_marzon_silent_blade") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_marzon_silent_bladeAI(pCreature); + return new npc_marzon_silent_bladeAI(creature); } struct npc_marzon_silent_bladeAI : public ScriptedAI { - npc_marzon_silent_bladeAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_marzon_silent_bladeAI(Creature* creature) : ScriptedAI(creature) { me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); } @@ -557,14 +557,14 @@ class npc_tyrion_spybot : public CreatureScript public: npc_tyrion_spybot() : CreatureScript("npc_tyrion_spybot") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_tyrion_spybotAI(pCreature); + return new npc_tyrion_spybotAI(creature); } struct npc_tyrion_spybotAI : public npc_escortAI { - npc_tyrion_spybotAI(Creature* pCreature) : npc_escortAI(pCreature) {} + npc_tyrion_spybotAI(Creature* creature) : npc_escortAI(creature) {} uint32 uiTimer; uint32 uiPhase; @@ -696,11 +696,11 @@ class npc_tyrion : public CreatureScript public: npc_tyrion() : CreatureScript("npc_tyrion") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *pQuest) { if (pQuest->GetQuestId() == QUEST_THE_ATTACK) { - if (Creature* pSpybot = pCreature->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true)) + if (Creature* pSpybot = creature->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true)) { CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->SetMaxPlayerDistance(200.0f); diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp index 73b24bd81a8..39c4b650f9a 100644 --- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp @@ -38,9 +38,9 @@ class mob_yenniku : public CreatureScript public: mob_yenniku() : CreatureScript("mob_yenniku") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_yennikuAI (pCreature); + return new mob_yennikuAI (creature); } struct mob_yennikuAI : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp index 67f2bd2c7e8..5b5cdecb0c9 100644 --- a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp +++ b/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp @@ -44,25 +44,25 @@ public: npc_galen_goodward() : CreatureScript("npc_galen_goodward") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) { if (quest->GetQuestId() == QUEST_GALENS_ESCAPE) { - CAST_AI(npc_galen_goodward::npc_galen_goodwardAI, pCreature->AI())->Start(false, false, pPlayer->GetGUID()); - pCreature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE); - DoScriptText(SAY_QUEST_ACCEPTED, pCreature); + CAST_AI(npc_galen_goodward::npc_galen_goodwardAI, creature->AI())->Start(false, false, pPlayer->GetGUID()); + creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE); + DoScriptText(SAY_QUEST_ACCEPTED, creature); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_galen_goodwardAI(pCreature); + return new npc_galen_goodwardAI(creature); } struct npc_galen_goodwardAI : public npc_escortAI { - npc_galen_goodwardAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_galen_goodwardAI(Creature* creature) : npc_escortAI(creature) { m_uiGalensCageGUID = 0; Reset(); diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 8d81fbc3bd8..0fea2593576 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -48,25 +48,25 @@ class npc_calvin_montague : public CreatureScript public: npc_calvin_montague() : CreatureScript("npc_calvin_montague") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) { if (pQuest->GetQuestId() == QUEST_590) { - pCreature->setFaction(FACTION_HOSTILE); - pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - CAST_AI(npc_calvin_montague::npc_calvin_montagueAI, pCreature->AI())->AttackStart(pPlayer); + creature->setFaction(FACTION_HOSTILE); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + CAST_AI(npc_calvin_montague::npc_calvin_montagueAI, creature->AI())->AttackStart(pPlayer); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_calvin_montagueAI (pCreature); + return new npc_calvin_montagueAI (creature); } struct npc_calvin_montagueAI : public ScriptedAI { - npc_calvin_montagueAI(Creature* pCreature) : ScriptedAI(pCreature) { } + npc_calvin_montagueAI(Creature* creature) : ScriptedAI(creature) { } uint32 m_uiPhase; uint32 m_uiPhaseTimer; diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index 78ac16227e3..cc3a6781cd3 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -66,24 +66,24 @@ class npc_lady_sylvanas_windrunner : public CreatureScript public: npc_lady_sylvanas_windrunner() : CreatureScript("npc_lady_sylvanas_windrunner") { } - bool OnQuestReward(Player* /*pPlayer*/, Creature* pCreature, const Quest *_Quest, uint32 /*slot*/) + bool OnQuestReward(Player* /*pPlayer*/, Creature* creature, const Quest *_Quest, uint32 /*slot*/) { if (_Quest->GetQuestId() == QUEST_JOURNEY_TO_UNDERCITY) { - CAST_AI(npc_lady_sylvanas_windrunner::npc_lady_sylvanas_windrunnerAI, pCreature->AI())->LamentEvent = true; - CAST_AI(npc_lady_sylvanas_windrunner::npc_lady_sylvanas_windrunnerAI, pCreature->AI())->DoPlaySoundToSet(pCreature, SOUND_CREDIT); - pCreature->CastSpell(pCreature, SPELL_SYLVANAS_CAST, false); + CAST_AI(npc_lady_sylvanas_windrunner::npc_lady_sylvanas_windrunnerAI, creature->AI())->LamentEvent = true; + CAST_AI(npc_lady_sylvanas_windrunner::npc_lady_sylvanas_windrunnerAI, creature->AI())->DoPlaySoundToSet(creature, SOUND_CREDIT); + creature->CastSpell(creature, SPELL_SYLVANAS_CAST, false); for (uint8 i = 0; i < 4; ++i) - pCreature->SummonCreature(ENTRY_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000); + creature->SummonCreature(ENTRY_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_lady_sylvanas_windrunnerAI (pCreature); + return new npc_lady_sylvanas_windrunnerAI (creature); } struct npc_lady_sylvanas_windrunnerAI : public ScriptedAI @@ -155,9 +155,9 @@ class npc_highborne_lamenter : public CreatureScript public: npc_highborne_lamenter() : CreatureScript("npc_highborne_lamenter") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_highborne_lamenterAI (pCreature); + return new npc_highborne_lamenterAI (creature); } struct npc_highborne_lamenterAI : public ScriptedAI @@ -219,13 +219,13 @@ class npc_parqual_fintallas : public CreatureScript public: npc_parqual_fintallas() : CreatureScript("npc_parqual_fintallas") { } - 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(); - pCreature->CastSpell(pPlayer, SPELL_MARK_OF_SHAME, false); + creature->CastSpell(pPlayer, SPELL_MARK_OF_SHAME, false); } if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { @@ -235,20 +235,20 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(6628) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasAura(SPELL_MARK_OF_SHAME)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(5822, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5822, creature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(5821, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5821, creature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 91fc1ee1076..8a70bccef00 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -49,43 +49,43 @@ class npcs_dithers_and_arbington : public CreatureScript public: npcs_dithers_and_arbington() : CreatureScript("npcs_dithers_and_arbington") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(3980, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3980, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(3981, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3981, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(3982, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3982, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(3983, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3983, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer, 17529, false); + creature->CastSpell(pPlayer, 17529, false); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (pCreature->isVendor()) + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); + if (creature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (pPlayer->GetQuestRewardStatus(5237) || pPlayer->GetQuestRewardStatus(5238)) @@ -94,9 +94,9 @@ public: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(3985, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3985, creature->GetGUID()); }else - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -121,7 +121,7 @@ class npc_myranda_the_hag : public CreatureScript public: npc_myranda_the_hag() : CreatureScript("npc_myranda_the_hag") { } - 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) @@ -132,20 +132,20 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_SUBTERFUGE) == QUEST_STATUS_COMPLETE && !pPlayer->GetQuestRewardStatus(QUEST_IN_DREAMS) && !pPlayer->HasAura(SPELL_SCARLET_ILLUSION)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ILLUSION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(4773, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4773, creature->GetGUID()); return true; } else - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -161,9 +161,9 @@ class npc_the_scourge_cauldron : public CreatureScript public: npc_the_scourge_cauldron() : CreatureScript("npc_the_scourge_cauldron") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_the_scourge_cauldronAI (pCreature); + return new npc_the_scourge_cauldronAI (creature); } struct npc_the_scourge_cauldronAI : public ScriptedAI @@ -246,9 +246,9 @@ class npc_andorhal_tower : public CreatureScript public: npc_andorhal_tower() : CreatureScript("npc_andorhal_tower") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_andorhal_towerAI (pCreature); + return new npc_andorhal_towerAI (creature); } struct npc_andorhal_towerAI : public Scripted_NoMovementAI @@ -293,23 +293,23 @@ class npc_anchorite_truuen : public CreatureScript public: npc_anchorite_truuen() : CreatureScript("npc_anchorite_truuen") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) { - npc_escortAI* pEscortAI = CAST_AI(npc_anchorite_truuen::npc_anchorite_truuenAI, pCreature->AI()); + npc_escortAI* pEscortAI = CAST_AI(npc_anchorite_truuen::npc_anchorite_truuenAI, creature->AI()); if (quest->GetQuestId() == QUEST_TOMB_LIGHTBRINGER) pEscortAI->Start(true, true, pPlayer->GetGUID()); return false; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_anchorite_truuenAI(pCreature); + return new npc_anchorite_truuenAI(creature); } struct npc_anchorite_truuenAI : public npc_escortAI { - npc_anchorite_truuenAI(Creature* pCreature) : npc_escortAI(pCreature) { } + npc_anchorite_truuenAI(Creature* creature) : npc_escortAI(creature) { } uint32 m_uiChatTimer; diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index 35e43abe0be..e55c3b430e6 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -54,27 +54,27 @@ class npc_daphne_stilwell : public CreatureScript public: npc_daphne_stilwell() : CreatureScript("npc_daphne_stilwell") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_TOME_VALOR) { - DoScriptText(SAY_DS_START, pCreature); + DoScriptText(SAY_DS_START, creature); - if (npc_escortAI* pEscortAI = CAST_AI(npc_daphne_stilwell::npc_daphne_stilwellAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_daphne_stilwell::npc_daphne_stilwellAI, creature->AI())) pEscortAI->Start(true, true, pPlayer->GetGUID()); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_daphne_stilwellAI(pCreature); + return new npc_daphne_stilwellAI(creature); } struct npc_daphne_stilwellAI : public npc_escortAI { - npc_daphne_stilwellAI(Creature* pCreature) : npc_escortAI(pCreature) {} + npc_daphne_stilwellAI(Creature* creature) : npc_escortAI(creature) {} uint32 uiWPHolder; uint32 uiShootTimer; @@ -205,22 +205,22 @@ class npc_defias_traitor : public CreatureScript public: npc_defias_traitor() : CreatureScript("npc_defias_traitor") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_DEFIAS_BROTHERHOOD) { - if (npc_escortAI* pEscortAI = CAST_AI(npc_defias_traitor::npc_defias_traitorAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_defias_traitor::npc_defias_traitorAI, creature->AI())) pEscortAI->Start(true, true, pPlayer->GetGUID()); - DoScriptText(SAY_START, pCreature, pPlayer); + DoScriptText(SAY_START, creature, pPlayer); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_defias_traitorAI(pCreature); + return new npc_defias_traitorAI(creature); } struct npc_defias_traitorAI : public npc_escortAI diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp index b89aa63d166..e1546f1ad22 100644 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/wetlands.cpp @@ -50,14 +50,14 @@ class npc_tapoke_slim_jahn : public CreatureScript public: npc_tapoke_slim_jahn() : CreatureScript("npc_tapoke_slim_jahn") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_tapoke_slim_jahnAI(pCreature); + return new npc_tapoke_slim_jahnAI(creature); } struct npc_tapoke_slim_jahnAI : public npc_escortAI { - npc_tapoke_slim_jahnAI(Creature* pCreature) : npc_escortAI(pCreature) { } + npc_tapoke_slim_jahnAI(Creature* creature) : npc_escortAI(creature) { } bool m_bFriendSummoned; @@ -144,11 +144,11 @@ class npc_mikhail : public CreatureScript public: npc_mikhail() : CreatureScript("npc_mikhail") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT11) { - Creature* pSlim = pCreature->FindNearestCreature(NPC_TAPOKE_SLIM_JAHN, 25.0f); + Creature* pSlim = creature->FindNearestCreature(NPC_TAPOKE_SLIM_JAHN, 25.0f); if (!pSlim) return false; |
