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/Outland | |
| parent | 3ddc1cc4c40b757dd42b781552b483a047a6df64 (diff) | |
Core: Start cleaning up hungarian notation - Phase1: pCreature -> creature
Diffstat (limited to 'src/server/scripts/Outland')
64 files changed, 676 insertions, 676 deletions
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index ee052d3bd4f..446783802e2 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -46,9 +46,9 @@ class mob_stolen_soul : public CreatureScript public: mob_stolen_soul() : CreatureScript("mob_stolen_soul") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_stolen_soulAI (pCreature); + return new mob_stolen_soulAI (creature); } struct mob_stolen_soulAI : public ScriptedAI @@ -155,9 +155,9 @@ class boss_exarch_maladaar : public CreatureScript public: boss_exarch_maladaar() : CreatureScript("boss_exarch_maladaar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_exarch_maladaarAI (pCreature); + return new boss_exarch_maladaarAI (creature); } struct boss_exarch_maladaarAI : public ScriptedAI @@ -312,9 +312,9 @@ class mob_avatar_of_martyred : public CreatureScript public: mob_avatar_of_martyred() : CreatureScript("mob_avatar_of_martyred") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_avatar_of_martyredAI (pCreature); + return new mob_avatar_of_martyredAI (creature); } struct mob_avatar_of_martyredAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index dc60969a729..d047ccefe46 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -45,9 +45,9 @@ class boss_shirrak_the_dead_watcher : public CreatureScript public: boss_shirrak_the_dead_watcher() : CreatureScript("boss_shirrak_the_dead_watcher") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_shirrak_the_dead_watcherAI (pCreature); + return new boss_shirrak_the_dead_watcherAI (creature); } struct boss_shirrak_the_dead_watcherAI : public ScriptedAI @@ -165,9 +165,9 @@ class mob_focus_fire : public CreatureScript public: mob_focus_fire() : CreatureScript("mob_focus_fire") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_focus_fireAI (pCreature); + return new mob_focus_fireAI (creature); } struct mob_focus_fireAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index e373382504e..77824c72a1c 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -60,9 +60,9 @@ class boss_nexusprince_shaffar : public CreatureScript public: boss_nexusprince_shaffar() : CreatureScript("boss_nexusprince_shaffar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_nexusprince_shaffarAI (pCreature); + return new boss_nexusprince_shaffarAI (creature); } struct boss_nexusprince_shaffarAI : public ScriptedAI @@ -226,9 +226,9 @@ class mob_ethereal_beacon : public CreatureScript public: mob_ethereal_beacon() : CreatureScript("mob_ethereal_beacon") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ethereal_beaconAI (pCreature); + return new mob_ethereal_beaconAI (creature); } struct mob_ethereal_beaconAI : public ScriptedAI @@ -318,9 +318,9 @@ class mob_ethereal_apprentice : public CreatureScript public: mob_ethereal_apprentice() : CreatureScript("mob_ethereal_apprentice") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ethereal_apprenticeAI (pCreature); + return new mob_ethereal_apprenticeAI (creature); } struct mob_ethereal_apprenticeAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index d55a717d831..6bc290f381d 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -46,9 +46,9 @@ class boss_pandemonius : public CreatureScript public: boss_pandemonius() : CreatureScript("boss_pandemonius") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_pandemoniusAI (pCreature); + return new boss_pandemoniusAI (creature); } struct boss_pandemoniusAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index c7c904e0402..5060e3ea59b 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -58,9 +58,9 @@ class boss_darkweaver_syth : public CreatureScript public: boss_darkweaver_syth() : CreatureScript("boss_darkweaver_syth") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_darkweaver_sythAI (pCreature); + return new boss_darkweaver_sythAI (creature); } struct boss_darkweaver_sythAI : public ScriptedAI @@ -247,9 +247,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_syth_fireAI (pCreature); + return new mob_syth_fireAI (creature); } }; @@ -258,9 +258,9 @@ class mob_syth_arcane : public CreatureScript public: mob_syth_arcane() : CreatureScript("mob_syth_arcane") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_syth_arcaneAI (pCreature); + return new mob_syth_arcaneAI (creature); } struct mob_syth_arcaneAI : public ScriptedAI @@ -312,9 +312,9 @@ class mob_syth_frost : public CreatureScript public: mob_syth_frost() : CreatureScript("mob_syth_frost") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_syth_frostAI (pCreature); + return new mob_syth_frostAI (creature); } struct mob_syth_frostAI : public ScriptedAI @@ -367,9 +367,9 @@ class mob_syth_shadow : public CreatureScript public: mob_syth_shadow() : CreatureScript("mob_syth_shadow") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_syth_shadowAI (pCreature); + return new mob_syth_shadowAI (creature); } struct mob_syth_shadowAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index 29df59cc7cb..1a773d81eef 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -57,9 +57,9 @@ class boss_talon_king_ikiss : public CreatureScript public: boss_talon_king_ikiss() : CreatureScript("boss_talon_king_ikiss") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_talon_king_ikissAI (pCreature); + return new boss_talon_king_ikissAI (creature); } struct boss_talon_king_ikissAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 40db25798b3..4c936116c90 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -49,16 +49,16 @@ class boss_ambassador_hellmaw : public CreatureScript public: boss_ambassador_hellmaw() : CreatureScript("boss_ambassador_hellmaw") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ambassador_hellmawAI(pCreature); + return new boss_ambassador_hellmawAI(creature); } struct boss_ambassador_hellmawAI : public npc_escortAI { - boss_ambassador_hellmawAI(Creature* pCreature) : npc_escortAI(pCreature) + boss_ambassador_hellmawAI(Creature* creature) : npc_escortAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 0177a66ca73..68a2ee1a8e7 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -59,9 +59,9 @@ class boss_blackheart_the_inciter : public CreatureScript public: boss_blackheart_the_inciter() : CreatureScript("boss_blackheart_the_inciter") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_blackheart_the_inciterAI (pCreature); + return new boss_blackheart_the_inciterAI (creature); } struct boss_blackheart_the_inciterAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index becaed6ae6a..c1d63b228cd 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -67,9 +67,9 @@ class mob_voidtraveler : public CreatureScript public: mob_voidtraveler() : CreatureScript("mob_voidtraveler") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_voidtravelerAI (pCreature); + return new mob_voidtravelerAI (creature); } struct mob_voidtravelerAI : public ScriptedAI @@ -140,9 +140,9 @@ class boss_grandmaster_vorpil : public CreatureScript public: boss_grandmaster_vorpil() : CreatureScript("boss_grandmaster_vorpil") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_grandmaster_vorpilAI (pCreature); + return new boss_grandmaster_vorpilAI (creature); } struct boss_grandmaster_vorpilAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 08ea0eaeb09..6601e298a01 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -41,9 +41,9 @@ class boss_murmur : public CreatureScript public: boss_murmur() : CreatureScript("boss_murmur") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_murmurAI (pCreature); + return new boss_murmurAI (creature); } struct boss_murmurAI : public ScriptedAI diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index 79367452638..52f83e1500c 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -42,7 +42,7 @@ class npc_spirit_of_olum : public CreatureScript public: npc_spirit_of_olum() : CreatureScript("npc_spirit_of_olum") { } - 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) @@ -53,14 +53,14 @@ public: 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(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, 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/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index b958243e5ec..76eff9fa474 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -60,9 +60,9 @@ class boss_gurtogg_bloodboil : public CreatureScript public: boss_gurtogg_bloodboil() : CreatureScript("boss_gurtogg_bloodboil") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_gurtogg_bloodboilAI (pCreature); + return new boss_gurtogg_bloodboilAI (creature); } struct boss_gurtogg_bloodboilAI : public ScriptedAI diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index c0f59817a79..29edd314f4b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -244,7 +244,7 @@ struct Yells { uint32 sound; std::string text; - uint32 pCreature, timer, emote; + uint32 creature, timer, emote; bool Talk; }; @@ -368,9 +368,9 @@ class mob_flame_of_azzinoth : public CreatureScript public: mob_flame_of_azzinoth() : CreatureScript("mob_flame_of_azzinoth") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new flame_of_azzinothAI (pCreature); + return new flame_of_azzinothAI (creature); } struct flame_of_azzinothAI : public ScriptedAI @@ -460,9 +460,9 @@ class boss_illidan_stormrage : public CreatureScript public: boss_illidan_stormrage() : CreatureScript("boss_illidan_stormrage") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_illidan_stormrageAI (pCreature); + return new boss_illidan_stormrageAI (creature); } struct boss_illidan_stormrageAI : public ScriptedAI @@ -617,22 +617,22 @@ public: { Timer[EVENT_TALK_SEQUENCE] = Conversation[count].timer; - Creature* pCreature = NULL; - if (Conversation[count].pCreature == ILLIDAN_STORMRAGE) - pCreature = me; - else if (Conversation[count].pCreature == AKAMA) - pCreature = (Unit::GetCreature((*me), AkamaGUID)); - else if (Conversation[count].pCreature == MAIEV_SHADOWSONG) - pCreature = (Unit::GetCreature((*me), MaievGUID)); + Creature* creature = NULL; + if (Conversation[count].creature == ILLIDAN_STORMRAGE) + creature = me; + else if (Conversation[count].creature == AKAMA) + creature = (Unit::GetCreature((*me), AkamaGUID)); + else if (Conversation[count].creature == MAIEV_SHADOWSONG) + creature = (Unit::GetCreature((*me), MaievGUID)); - if (pCreature) + if (creature) { if (Conversation[count].emote) - pCreature->HandleEmoteCommand(Conversation[count].emote); // Make the Creature do some animation! + creature->HandleEmoteCommand(Conversation[count].emote); // Make the Creature do some animation! if (Conversation[count].text.size()) - pCreature->MonsterYell(Conversation[count].text.c_str(), LANG_UNIVERSAL, 0); // Have the Creature yell out some text + creature->MonsterYell(Conversation[count].text.c_str(), LANG_UNIVERSAL, 0); // Have the Creature yell out some text if (Conversation[count].sound) - DoPlaySoundToSet(pCreature, Conversation[count].sound); // Play some sound on the creature + DoPlaySoundToSet(creature, Conversation[count].sound); // Play some sound on the creature } } @@ -1150,9 +1150,9 @@ class boss_maiev_shadowsong : public CreatureScript public: boss_maiev_shadowsong() : CreatureScript("boss_maiev_shadowsong") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_maievAI (pCreature); + return new boss_maievAI (creature); } struct boss_maievAI : public ScriptedAI @@ -1800,28 +1800,28 @@ public: } }; - 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) // Time to begin the Event { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_akama_illidan::npc_akama_illidanAI, pCreature->AI())->EnterPhase(PHASE_CHANNEL); + CAST_AI(npc_akama_illidan::npc_akama_illidanAI, creature->AI())->EnterPhase(PHASE_CHANNEL); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(10465, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10465, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_akama_illidanAI(pCreature); + return new npc_akama_illidanAI(creature); } }; @@ -2010,9 +2010,9 @@ class mob_cage_trap_trigger : public CreatureScript public: mob_cage_trap_trigger() : CreatureScript("mob_cage_trap_trigger") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new cage_trap_triggerAI (pCreature); + return new cage_trap_triggerAI (creature); } struct cage_trap_triggerAI : public ScriptedAI @@ -2107,9 +2107,9 @@ class mob_shadow_demon : public CreatureScript public: mob_shadow_demon() : CreatureScript("mob_shadow_demon") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new shadow_demonAI (pCreature); + return new shadow_demonAI (creature); } struct shadow_demonAI : public ScriptedAI @@ -2158,9 +2158,9 @@ class mob_blade_of_azzinoth : public CreatureScript public: mob_blade_of_azzinoth() : CreatureScript("mob_blade_of_azzinoth") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new blade_of_azzinothAI (pCreature); + return new blade_of_azzinothAI (creature); } struct blade_of_azzinothAI : public NullCreatureAI @@ -2181,9 +2181,9 @@ class mob_parasitic_shadowfiend : public CreatureScript public: mob_parasitic_shadowfiend() : CreatureScript("mob_parasitic_shadowfiend") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_parasitic_shadowfiendAI (pCreature); + return new mob_parasitic_shadowfiendAI (creature); } // Shadowfiends interact with Illidan, setting more targets in Illidan's hashmap diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 1cfd66bdfd1..0bf3d3f54bb 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -83,9 +83,9 @@ class boss_mother_shahraz : public CreatureScript public: boss_mother_shahraz() : CreatureScript("boss_mother_shahraz") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_shahrazAI (pCreature); + return new boss_shahrazAI (creature); } struct boss_shahrazAI : public ScriptedAI diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 18899fc5db8..13a877b91f0 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -106,9 +106,9 @@ class npc_enslaved_soul : public CreatureScript public: npc_enslaved_soul() : CreatureScript("npc_enslaved_soul") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_enslaved_soulAI (pCreature); + return new npc_enslaved_soulAI (creature); } struct npc_enslaved_soulAI : public ScriptedAI @@ -135,9 +135,9 @@ class boss_reliquary_of_souls : public CreatureScript public: boss_reliquary_of_souls() : CreatureScript("boss_reliquary_of_souls") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_reliquary_of_soulsAI (pCreature); + return new boss_reliquary_of_soulsAI (creature); } struct boss_reliquary_of_soulsAI : public ScriptedAI @@ -372,9 +372,9 @@ class boss_essence_of_suffering : public CreatureScript public: boss_essence_of_suffering() : CreatureScript("boss_essence_of_suffering") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_essence_of_sufferingAI (pCreature); + return new boss_essence_of_sufferingAI (creature); } struct boss_essence_of_sufferingAI : public ScriptedAI @@ -497,9 +497,9 @@ class boss_essence_of_desire : public CreatureScript public: boss_essence_of_desire() : CreatureScript("boss_essence_of_desire") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_essence_of_desireAI (pCreature); + return new boss_essence_of_desireAI (creature); } struct boss_essence_of_desireAI : public ScriptedAI @@ -600,9 +600,9 @@ class boss_essence_of_anger : public CreatureScript public: boss_essence_of_anger() : CreatureScript("boss_essence_of_anger") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_essence_of_angerAI (pCreature); + return new boss_essence_of_angerAI (creature); } struct boss_essence_of_angerAI : public ScriptedAI diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index b935f82c7f5..41e610b5b14 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -114,9 +114,9 @@ class mob_ashtongue_channeler : public CreatureScript public: mob_ashtongue_channeler() : CreatureScript("mob_ashtongue_channeler") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ashtongue_channelerAI (pCreature); + return new mob_ashtongue_channelerAI (creature); } struct mob_ashtongue_channelerAI : public ScriptedAI @@ -140,9 +140,9 @@ class mob_ashtongue_sorcerer : public CreatureScript public: mob_ashtongue_sorcerer() : CreatureScript("mob_ashtongue_sorcerer") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ashtongue_sorcererAI (pCreature); + return new mob_ashtongue_sorcererAI (creature); } struct mob_ashtongue_sorcererAI : public ScriptedAI @@ -195,9 +195,9 @@ class boss_shade_of_akama : public CreatureScript public: boss_shade_of_akama() : CreatureScript("boss_shade_of_akama") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_shade_of_akamaAI (pCreature); + return new boss_shade_of_akamaAI (creature); } struct boss_shade_of_akamaAI : public ScriptedAI @@ -541,32 +541,32 @@ class npc_akama_shade : public CreatureScript public: npc_akama_shade() : CreatureScript("npc_akama_shade") { } - 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) //Fight time { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_akama_shade::npc_akamaAI, pCreature->AI())->BeginEvent(pPlayer); + CAST_AI(npc_akama_shade::npc_akamaAI, creature->AI())->BeginEvent(pPlayer); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->isAlive()) { 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 npc_akamaAI (pCreature); + return new npc_akamaAI (creature); } struct npc_akamaAI : public ScriptedAI diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 9863ad9b972..757ce9ba76b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -58,9 +58,9 @@ class molten_flame : public CreatureScript public: molten_flame() : CreatureScript("molten_flame") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new molten_flameAI (pCreature); + return new molten_flameAI (creature); } struct molten_flameAI : public NullCreatureAI @@ -84,9 +84,9 @@ class boss_supremus : public CreatureScript public: boss_supremus() : CreatureScript("boss_supremus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_supremusAI (pCreature); + return new boss_supremusAI (creature); } struct boss_supremusAI : public ScriptedAI @@ -256,9 +256,9 @@ class npc_volcano : public CreatureScript public: npc_volcano() : CreatureScript("npc_volcano") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_volcanoAI (pCreature); + return new npc_volcanoAI (creature); } struct npc_volcanoAI : public Scripted_NoMovementAI diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 99ef003b98a..d02f73ff87e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -56,9 +56,9 @@ class mob_doom_blossom : public CreatureScript public: mob_doom_blossom() : CreatureScript("mob_doom_blossom") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_doom_blossomAI(pCreature); + return new mob_doom_blossomAI(creature); } struct mob_doom_blossomAI : public ScriptedAI @@ -122,9 +122,9 @@ class mob_shadowy_construct : public CreatureScript public: mob_shadowy_construct() : CreatureScript("mob_shadowy_construct") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_shadowy_constructAI(pCreature); + return new mob_shadowy_constructAI(creature); } struct mob_shadowy_constructAI : public ScriptedAI @@ -212,9 +212,9 @@ class boss_teron_gorefiend : public CreatureScript public: boss_teron_gorefiend() : CreatureScript("boss_teron_gorefiend") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_teron_gorefiendAI (pCreature); + return new boss_teron_gorefiendAI (creature); } struct boss_teron_gorefiendAI : public ScriptedAI diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 922124a51b5..0b9574cda9c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -65,9 +65,9 @@ class boss_najentus : public CreatureScript public: boss_najentus() : CreatureScript("boss_najentus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_najentusAI (pCreature); + return new boss_najentusAI (creature); } struct boss_najentusAI : public ScriptedAI diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 42b7463b5b0..d82d74339d5 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -210,9 +210,9 @@ class mob_illidari_council : public CreatureScript public: mob_illidari_council() : CreatureScript("mob_illidari_council") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_illidari_councilAI (pCreature); + return new mob_illidari_councilAI (creature); } struct mob_illidari_councilAI : public ScriptedAI @@ -408,7 +408,7 @@ struct boss_illidari_councilAI : public ScriptedAI } DoZoneInCombat(); // Load GUIDs on first aggro because the Creature guids are only set as the creatures are created in world- - // this means that for each pCreature, it will attempt to LoadGUIDs even though some of the other creatures are + // this means that for each creature, it will attempt to LoadGUIDs even though some of the other creatures are // not in world, and thus have no GUID set in the instance data system. Putting it in aggro ensures that all the creatures // have been loaded and have their GUIDs set in the instance data system. if (!LoadedGUIDs) @@ -468,9 +468,9 @@ class boss_gathios_the_shatterer : public CreatureScript public: boss_gathios_the_shatterer() : CreatureScript("boss_gathios_the_shatterer") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_gathios_the_shattererAI (pCreature); + return new boss_gathios_the_shattererAI (creature); } struct boss_gathios_the_shattererAI : public boss_illidari_councilAI @@ -595,9 +595,9 @@ class boss_high_nethermancer_zerevor : public CreatureScript public: boss_high_nethermancer_zerevor() : CreatureScript("boss_high_nethermancer_zerevor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_high_nethermancer_zerevorAI (pCreature); + return new boss_high_nethermancer_zerevorAI (creature); } struct boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI @@ -699,9 +699,9 @@ class boss_lady_malande : public CreatureScript public: boss_lady_malande() : CreatureScript("boss_lady_malande") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lady_malandeAI (pCreature); + return new boss_lady_malandeAI (creature); } struct boss_lady_malandeAI : public boss_illidari_councilAI @@ -777,9 +777,9 @@ class boss_veras_darkshadow : public CreatureScript public: boss_veras_darkshadow() : CreatureScript("boss_veras_darkshadow") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_veras_darkshadowAI (pCreature); + return new boss_veras_darkshadowAI (creature); } struct boss_veras_darkshadowAI : public boss_illidari_councilAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index dd81d4d763f..d89afc47f00 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -100,9 +100,9 @@ class boss_fathomlord_karathress : public CreatureScript public: boss_fathomlord_karathress() : CreatureScript("boss_fathomlord_karathress") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_fathomlord_karathressAI (pCreature); + return new boss_fathomlord_karathressAI (creature); } struct boss_fathomlord_karathressAI : public ScriptedAI @@ -310,9 +310,9 @@ class boss_fathomguard_sharkkis : public CreatureScript public: boss_fathomguard_sharkkis() : CreatureScript("boss_fathomguard_sharkkis") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_fathomguard_sharkkisAI (pCreature); + return new boss_fathomguard_sharkkisAI (creature); } struct boss_fathomguard_sharkkisAI : public ScriptedAI @@ -464,9 +464,9 @@ class boss_fathomguard_tidalvess : public CreatureScript public: boss_fathomguard_tidalvess() : CreatureScript("boss_fathomguard_tidalvess") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_fathomguard_tidalvessAI (pCreature); + return new boss_fathomguard_tidalvessAI (creature); } struct boss_fathomguard_tidalvessAI : public ScriptedAI @@ -591,9 +591,9 @@ class boss_fathomguard_caribdis : public CreatureScript public: boss_fathomguard_caribdis() : CreatureScript("boss_fathomguard_caribdis") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_fathomguard_caribdisAI (pCreature); + return new boss_fathomguard_caribdisAI (creature); } struct boss_fathomguard_caribdisAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index f33210ad799..00dd3b1c9fb 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -81,9 +81,9 @@ class boss_hydross_the_unstable : public CreatureScript public: boss_hydross_the_unstable() : CreatureScript("boss_hydross_the_unstable") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_hydross_the_unstableAI (pCreature); + return new boss_hydross_the_unstableAI (creature); } struct boss_hydross_the_unstableAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 0f3cf979e66..64dd359af40 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -138,9 +138,9 @@ class boss_lady_vashj : public CreatureScript public: boss_lady_vashj() : CreatureScript("boss_lady_vashj") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lady_vashjAI (pCreature); + return new boss_lady_vashjAI (creature); } struct boss_lady_vashjAI : public ScriptedAI @@ -404,12 +404,12 @@ public: me->GetMotionMaster()->Clear(); DoTeleportTo(MIDDLE_X, MIDDLE_Y, MIDDLE_Z); - Creature* pCreature; + Creature* creature; for (uint8 i = 0; i < 4; ++i) { - pCreature = me->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); - if (pCreature) - ShieldGeneratorChannel[i] = pCreature->GetGUID(); + creature = me->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); + if (creature) + ShieldGeneratorChannel[i] = creature->GetGUID(); } DoScriptText(SAY_PHASE2, me); } @@ -580,9 +580,9 @@ class mob_enchanted_elemental : public CreatureScript public: mob_enchanted_elemental() : CreatureScript("mob_enchanted_elemental") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_enchanted_elementalAI (pCreature); + return new mob_enchanted_elementalAI (creature); } struct mob_enchanted_elementalAI : public ScriptedAI @@ -682,9 +682,9 @@ class mob_tainted_elemental : public CreatureScript public: mob_tainted_elemental() : CreatureScript("mob_tainted_elemental") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_tainted_elementalAI (pCreature); + return new mob_tainted_elementalAI (creature); } struct mob_tainted_elementalAI : public ScriptedAI @@ -757,9 +757,9 @@ class mob_toxic_sporebat : public CreatureScript public: mob_toxic_sporebat() : CreatureScript("mob_toxic_sporebat") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toxic_sporebatAI (pCreature); + return new mob_toxic_sporebatAI (creature); } struct mob_toxic_sporebatAI : public ScriptedAI @@ -865,9 +865,9 @@ class mob_coilfang_elite : public CreatureScript public: mob_coilfang_elite() : CreatureScript("mob_coilfang_elite") { } - 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 = 31345; //Cleave @@ -890,9 +890,9 @@ class mob_coilfang_strider : public CreatureScript public: mob_coilfang_strider() : CreatureScript("mob_coilfang_strider") { } - 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 = 41374; //Mind Blast @@ -915,9 +915,9 @@ class mob_shield_generator_channel : public CreatureScript public: mob_shield_generator_channel() : CreatureScript("mob_shield_generator_channel") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_shield_generator_channelAI (pCreature); + return new mob_shield_generator_channelAI (creature); } struct mob_shield_generator_channelAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index be35d848b30..0a8f4ff574e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -72,9 +72,9 @@ class mob_inner_demon : public CreatureScript public: mob_inner_demon() : CreatureScript("mob_inner_demon") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_inner_demonAI (pCreature); + return new mob_inner_demonAI (creature); } struct mob_inner_demonAI : public ScriptedAI @@ -163,9 +163,9 @@ class boss_leotheras_the_blind : public CreatureScript public: boss_leotheras_the_blind() : CreatureScript("boss_leotheras_the_blind") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_leotheras_the_blindAI (pCreature); + return new boss_leotheras_the_blindAI (creature); } struct boss_leotheras_the_blindAI : public ScriptedAI @@ -335,10 +335,10 @@ public: if (InnderDemon[i]) { //delete creature - Creature* pCreature = Unit::GetCreature((*me), InnderDemon[i]); - if (pCreature && pCreature->isAlive()) + Creature* creature = Unit::GetCreature((*me), InnderDemon[i]); + if (creature && creature->isAlive()) { - pCreature->DespawnOrUnsummon(); + creature->DespawnOrUnsummon(); } InnderDemon[i] = 0; } @@ -593,9 +593,9 @@ class boss_leotheras_the_blind_demonform : public CreatureScript public: boss_leotheras_the_blind_demonform() : CreatureScript("boss_leotheras_the_blind_demonform") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_leotheras_the_blind_demonformAI (pCreature); + return new boss_leotheras_the_blind_demonformAI (creature); } struct boss_leotheras_the_blind_demonformAI : public ScriptedAI @@ -666,9 +666,9 @@ class mob_greyheart_spellbinder : public CreatureScript public: mob_greyheart_spellbinder() : CreatureScript("mob_greyheart_spellbinder") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_greyheart_spellbinderAI (pCreature); + return new mob_greyheart_spellbinderAI (creature); } struct mob_greyheart_spellbinderAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index d4593e6118c..52055a5ef3a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -71,9 +71,9 @@ class boss_the_lurker_below : public CreatureScript public: boss_the_lurker_below() : CreatureScript("boss_the_lurker_below") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_the_lurker_belowAI (pCreature); + return new boss_the_lurker_belowAI (creature); } struct boss_the_lurker_belowAI : public Scripted_NoMovementAI @@ -375,9 +375,9 @@ class mob_coilfang_guardian : public CreatureScript public: mob_coilfang_guardian() : CreatureScript("mob_coilfang_guardian") { } - 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_ARCINGSMASH; @@ -401,9 +401,9 @@ class mob_coilfang_ambusher : public CreatureScript public: mob_coilfang_ambusher() : CreatureScript("mob_coilfang_ambusher") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_coilfang_ambusherAI (pCreature); + return new mob_coilfang_ambusherAI (creature); } struct mob_coilfang_ambusherAI : public Scripted_NoMovementAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index f1c0fb98bee..9077fe7756f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -82,9 +82,9 @@ class boss_morogrim_tidewalker : public CreatureScript public: boss_morogrim_tidewalker() : CreatureScript("boss_morogrim_tidewalker") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_morogrim_tidewalkerAI (pCreature); + return new boss_morogrim_tidewalkerAI (creature); } struct boss_morogrim_tidewalkerAI : public ScriptedAI @@ -289,9 +289,9 @@ class mob_water_globule : public CreatureScript public: mob_water_globule() : CreatureScript("mob_water_globule") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_water_globuleAI (pCreature); + return new mob_water_globuleAI (creature); } struct mob_water_globuleAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 622c8705551..7c651742c3e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -51,9 +51,9 @@ class boss_hydromancer_thespia : public CreatureScript public: boss_hydromancer_thespia() : CreatureScript("boss_hydromancer_thespia") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_thespiaAI (pCreature); + return new boss_thespiaAI (creature); } struct boss_thespiaAI : public ScriptedAI @@ -151,9 +151,9 @@ class mob_coilfang_waterelemental : public CreatureScript public: mob_coilfang_waterelemental() : CreatureScript("mob_coilfang_waterelemental") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_coilfang_waterelementalAI (pCreature); + return new mob_coilfang_waterelementalAI (creature); } struct mob_coilfang_waterelementalAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 556a0310f38..f8f059afff4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -53,9 +53,9 @@ class boss_mekgineer_steamrigger : public CreatureScript public: boss_mekgineer_steamrigger() : CreatureScript("boss_mekgineer_steamrigger") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_mekgineer_steamriggerAI (pCreature); + return new boss_mekgineer_steamriggerAI (creature); } struct boss_mekgineer_steamriggerAI : public ScriptedAI @@ -197,9 +197,9 @@ class mob_steamrigger_mechanic : public CreatureScript public: mob_steamrigger_mechanic() : CreatureScript("mob_steamrigger_mechanic") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_steamrigger_mechanicAI (pCreature); + return new mob_steamrigger_mechanicAI (creature); } struct mob_steamrigger_mechanicAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index d29fa5fbec4..1893dd689f4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -47,9 +47,9 @@ class mob_naga_distiller : public CreatureScript public: mob_naga_distiller() : CreatureScript("mob_naga_distiller") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_naga_distillerAI (pCreature); + return new mob_naga_distillerAI (creature); } struct mob_naga_distillerAI : public ScriptedAI @@ -105,9 +105,9 @@ class boss_warlord_kalithresh : public CreatureScript public: boss_warlord_kalithresh() : CreatureScript("boss_warlord_kalithresh") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_warlord_kalithreshAI (pCreature); + return new boss_warlord_kalithreshAI (creature); } struct boss_warlord_kalithreshAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index f39e1e35bb7..0dd05d9e03a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -33,9 +33,9 @@ class boss_hungarfen : public CreatureScript public: boss_hungarfen() : CreatureScript("boss_hungarfen") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_hungarfenAI (pCreature); + return new boss_hungarfenAI (creature); } struct boss_hungarfenAI : public ScriptedAI @@ -105,9 +105,9 @@ class mob_underbog_mushroom : public CreatureScript public: mob_underbog_mushroom() : CreatureScript("mob_underbog_mushroom") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_underbog_mushroomAI (pCreature); + return new mob_underbog_mushroomAI (creature); } struct mob_underbog_mushroomAI : public ScriptedAI diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 5899de455b9..63379918fb7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -40,9 +40,9 @@ class boss_the_black_stalker : public CreatureScript public: boss_the_black_stalker() : CreatureScript("boss_the_black_stalker") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_the_black_stalkerAI (pCreature); + return new boss_the_black_stalkerAI (creature); } struct boss_the_black_stalkerAI : public ScriptedAI diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 1ea7b0ad91e..a2d409e7b35 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -59,9 +59,9 @@ class boss_gruul : public CreatureScript public: boss_gruul() : CreatureScript("boss_gruul") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_gruulAI (pCreature); + return new boss_gruulAI (creature); } struct boss_gruulAI : public ScriptedAI diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index dc44a455c34..ac96dc5186f 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -111,9 +111,9 @@ class boss_high_king_maulgar : public CreatureScript public: boss_high_king_maulgar() : CreatureScript("boss_high_king_maulgar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_high_king_maulgarAI (pCreature); + return new boss_high_king_maulgarAI (creature); } struct boss_high_king_maulgarAI : public ScriptedAI @@ -149,16 +149,16 @@ public: Phase2 = false; - Creature* pCreature = NULL; + Creature* creature = NULL; for (uint8 i = 0; i < 4; ++i) { if (Council[i]) { - pCreature = (Unit::GetCreature((*me), Council[i])); - if (pCreature && !pCreature->isAlive()) + creature = (Unit::GetCreature((*me), Council[i])); + if (creature && !creature->isAlive()) { - pCreature->Respawn(); - pCreature->AI()->EnterEvadeMode(); + creature->Respawn(); + creature->AI()->EnterEvadeMode(); } } } @@ -310,9 +310,9 @@ class boss_olm_the_summoner : public CreatureScript public: boss_olm_the_summoner() : CreatureScript("boss_olm_the_summoner") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_olm_the_summonerAI (pCreature); + return new boss_olm_the_summonerAI (creature); } struct boss_olm_the_summonerAI : public ScriptedAI @@ -438,9 +438,9 @@ class boss_kiggler_the_crazed : public CreatureScript public: boss_kiggler_the_crazed() : CreatureScript("boss_kiggler_the_crazed") { } - CreatureAI *GetAI(Creature* pCreature) const + CreatureAI *GetAI(Creature* creature) const { - return new boss_kiggler_the_crazedAI (pCreature); + return new boss_kiggler_the_crazedAI (creature); } struct boss_kiggler_the_crazedAI : public ScriptedAI @@ -560,9 +560,9 @@ class boss_blindeye_the_seer : public CreatureScript public: boss_blindeye_the_seer() : CreatureScript("boss_blindeye_the_seer") { } - CreatureAI *GetAI(Creature* pCreature) const + CreatureAI *GetAI(Creature* creature) const { - return new boss_blindeye_the_seerAI (pCreature); + return new boss_blindeye_the_seerAI (creature); } struct boss_blindeye_the_seerAI : public ScriptedAI @@ -670,9 +670,9 @@ class boss_krosh_firehand : public CreatureScript public: boss_krosh_firehand() : CreatureScript("boss_krosh_firehand") { } - CreatureAI *GetAI(Creature* pCreature) const + CreatureAI *GetAI(Creature* creature) const { - return new boss_krosh_firehandAI (pCreature); + return new boss_krosh_firehandAI (creature); } struct boss_krosh_firehandAI : public ScriptedAI diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index f290c0f8125..832417fbeb2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -48,9 +48,9 @@ class boss_broggok : public CreatureScript struct boss_broggokAI : public ScriptedAI { - boss_broggokAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_broggokAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 7953ac48fc7..b5f75d8e537 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -78,9 +78,9 @@ class boss_kelidan_the_breaker : public CreatureScript struct boss_kelidan_the_breakerAI : public ScriptedAI { - boss_kelidan_the_breakerAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_kelidan_the_breakerAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); for (uint8 i=0; i<5; ++i) Channelers[i] = 0; } @@ -298,7 +298,7 @@ class mob_shadowmoon_channeler : public CreatureScript struct mob_shadowmoon_channelerAI : public ScriptedAI { - mob_shadowmoon_channelerAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index a457d06809a..c28c48295c5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -52,9 +52,9 @@ class boss_the_maker : public CreatureScript struct boss_the_makerAI : public ScriptedAI { - boss_the_makerAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_the_makerAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 17a2ab8d8d7..f7746db3ed1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -60,7 +60,7 @@ class boss_omor_the_unscarred : public CreatureScript struct boss_omor_the_unscarredAI : public ScriptedAI { - boss_omor_the_unscarredAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_omor_the_unscarredAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 88997f8aad9..3096471df0e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -82,7 +82,7 @@ class boss_nazan : public CreatureScript struct boss_nazanAI : public ScriptedAI { - boss_nazanAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_nazanAI(Creature* creature) : ScriptedAI(creature) { VazrudenGUID = 0; flight = true; @@ -210,7 +210,7 @@ class boss_vazruden : public CreatureScript } struct boss_vazrudenAI : public ScriptedAI { - boss_vazrudenAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_vazrudenAI(Creature* creature) : ScriptedAI(creature) { } @@ -289,7 +289,7 @@ class boss_vazruden_the_herald : public CreatureScript struct boss_vazruden_the_heraldAI : public ScriptedAI { - boss_vazruden_the_heraldAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_vazruden_the_heraldAI(Creature* creature) : ScriptedAI(creature) { summoned = false; sentryDown = false; @@ -469,7 +469,7 @@ class mob_hellfire_sentry : public CreatureScript } struct mob_hellfire_sentryAI : public ScriptedAI { - mob_hellfire_sentryAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) {} uint32 KidneyShot_Timer; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 97d57f10ad5..28127d88b9a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -57,7 +57,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript struct boss_watchkeeper_gargolmarAI : public ScriptedAI { - boss_watchkeeper_gargolmarAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_watchkeeper_gargolmarAI(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 09f0001aa82..a7368c434da 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -109,7 +109,7 @@ class mob_abyssal : public CreatureScript struct mob_abyssalAI : public ScriptedAI { - mob_abyssalAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_abyssalAI(Creature* creature) : ScriptedAI(creature) { trigger = 0; Despawn_Timer = 60000; @@ -215,9 +215,9 @@ class boss_magtheridon : public CreatureScript struct boss_magtheridonAI : public ScriptedAI { - boss_magtheridonAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_magtheridonAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); @@ -495,9 +495,9 @@ class mob_hellfire_channeler : public CreatureScript struct mob_hellfire_channelerAI : public ScriptedAI { - mob_hellfire_channelerAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 72bb21e6b89..1808a4ce73f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -89,9 +89,9 @@ class boss_grand_warlock_nethekurse : public CreatureScript struct boss_grand_warlock_nethekurseAI : public ScriptedAI { - boss_grand_warlock_nethekurseAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_grand_warlock_nethekurseAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -318,9 +318,9 @@ class mob_fel_orc_convert : public CreatureScript struct mob_fel_orc_convertAI : public ScriptedAI { - mob_fel_orc_convertAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -401,7 +401,7 @@ class mob_lesser_shadow_fissure : public CreatureScript struct mob_lesser_shadow_fissureAI : public ScriptedAI { - mob_lesser_shadow_fissureAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } void MoveInLineOfSight(Unit* /*who*/) {} @@ -409,9 +409,9 @@ class mob_lesser_shadow_fissure : public CreatureScript void EnterCombat(Unit* /*who*/) {} }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_lesser_shadow_fissureAI (pCreature); + return new mob_lesser_shadow_fissureAI (creature); } }; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 5d3fe13757f..537ddcbdb10 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -112,7 +112,7 @@ class mob_omrogg_heads : public CreatureScript struct mob_omrogg_headsAI : public ScriptedAI { - mob_omrogg_headsAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_omrogg_headsAI(Creature* creature) : ScriptedAI(creature) {} bool DeathYell; uint32 Death_Timer; @@ -160,11 +160,11 @@ class boss_warbringer_omrogg : public CreatureScript struct boss_warbringer_omroggAI : public ScriptedAI { - boss_warbringer_omroggAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_warbringer_omroggAI(Creature* creature) : ScriptedAI(creature) { LeftHeadGUID = 0; RightHeadGUID = 0; - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -414,9 +414,9 @@ class boss_warbringer_omrogg : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_warbringer_omroggAI (pCreature); + return new boss_warbringer_omroggAI (creature); } }; void AddSC_boss_warbringer_omrogg() diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index a3cac32c06f..5b91bb8e9e6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -70,7 +70,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript struct boss_warchief_kargath_bladefistAI : public ScriptedAI { - boss_warchief_kargath_bladefistAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_warchief_kargath_bladefistAI(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 67b67f61742..f57d28978f1 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -80,10 +80,10 @@ class boss_alar : public CreatureScript } struct boss_alarAI : public ScriptedAI { - boss_alarAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_alarAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); - DefaultMoveSpeedRate = pCreature->GetSpeedRate(MOVE_RUN); + pInstance = creature->GetInstanceScript(); + DefaultMoveSpeedRate = creature->GetSpeedRate(MOVE_RUN); } InstanceScript *pInstance; @@ -467,11 +467,11 @@ class mob_ember_of_alar : public CreatureScript struct mob_ember_of_alarAI : public ScriptedAI { - mob_ember_of_alarAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_ember_of_alarAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); - pCreature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); - pCreature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); + pInstance = creature->GetInstanceScript(); + creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } InstanceScript *pInstance; @@ -546,7 +546,7 @@ class mob_flame_patch_alar : public CreatureScript struct mob_flame_patch_alarAI : public ScriptedAI { - mob_flame_patch_alarAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* /*who*/) {} diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index b14803a9214..a87d87767c0 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -83,12 +83,12 @@ class boss_high_astromancer_solarian : public CreatureScript struct boss_high_astromancer_solarianAI : public ScriptedAI { - boss_high_astromancer_solarianAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_high_astromancer_solarianAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); - defaultarmor = pCreature->GetArmor(); - defaultsize = pCreature->GetFloatValue(OBJECT_FIELD_SCALE_X); + defaultarmor = creature->GetArmor(); + defaultsize = creature->GetFloatValue(OBJECT_FIELD_SCALE_X); } InstanceScript *pInstance; @@ -417,9 +417,9 @@ class mob_solarium_priest : public CreatureScript struct mob_solarium_priestAI : public ScriptedAI { - mob_solarium_priestAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_solarium_priestAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript *pInstance; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index a2d0fbd5ba7..0b94e4ad13e 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -145,9 +145,9 @@ const float afGravityPos[3] = {795.0f, 0.0f, 70.0f}; //Base AI for Advisors struct advisorbase_ai : public ScriptedAI { - advisorbase_ai(Creature* pCreature) : ScriptedAI(pCreature) + advisorbase_ai(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); m_bDoubled_Health = false; } @@ -278,9 +278,9 @@ class boss_kaelthas : public CreatureScript //Kael'thas AI struct boss_kaelthasAI : public ScriptedAI { - boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me) + boss_kaelthasAI(Creature* creature) : ScriptedAI(creature), summons(me) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid)); } @@ -343,12 +343,12 @@ class boss_kaelthas : public CreatureScript { for (uint8 i = 0; i < MAX_ADVISORS; ++i) { - if (Creature* pCreature = Unit::GetCreature((*me), m_auiAdvisorGuid[i])) + if (Creature* creature = Unit::GetCreature((*me), m_auiAdvisorGuid[i])) { - pCreature->Respawn(); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pCreature->setFaction(me->getFaction()); - pCreature->AI()->EnterEvadeMode(); + creature->Respawn(); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->setFaction(me->getFaction()); + creature->AI()->EnterEvadeMode(); } } } @@ -1016,7 +1016,7 @@ class boss_thaladred_the_darkener : public CreatureScript } struct boss_thaladred_the_darkenerAI : public advisorbase_ai { - boss_thaladred_the_darkenerAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + boss_thaladred_the_darkenerAI(Creature* creature) : advisorbase_ai(creature) {} uint32 Gaze_Timer; uint32 Silence_Timer; @@ -1114,7 +1114,7 @@ class boss_lord_sanguinar : public CreatureScript } struct boss_lord_sanguinarAI : public advisorbase_ai { - boss_lord_sanguinarAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + boss_lord_sanguinarAI(Creature* creature) : advisorbase_ai(creature) {} uint32 Fear_Timer; @@ -1181,7 +1181,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } struct boss_grand_astromancer_capernianAI : public advisorbase_ai { - boss_grand_astromancer_capernianAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + boss_grand_astromancer_capernianAI(Creature* creature) : advisorbase_ai(creature) {} uint32 Fireball_Timer; uint32 Conflagration_Timer; @@ -1326,7 +1326,7 @@ class boss_master_engineer_telonicus : public CreatureScript } struct boss_master_engineer_telonicusAI : public advisorbase_ai { - boss_master_engineer_telonicusAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + boss_master_engineer_telonicusAI(Creature* creature) : advisorbase_ai(creature) {} uint32 Bomb_Timer; uint32 RemoteToy_Timer; @@ -1409,7 +1409,7 @@ class mob_kael_flamestrike : public CreatureScript } struct mob_kael_flamestrikeAI : public Scripted_NoMovementAI { - mob_kael_flamestrikeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) {} + mob_kael_flamestrikeAI(Creature* creature) : Scripted_NoMovementAI(creature) {} uint32 Timer; bool Casting; @@ -1473,7 +1473,7 @@ class mob_phoenix_tk : public CreatureScript } struct mob_phoenix_tkAI : public ScriptedAI { - mob_phoenix_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_phoenix_tkAI(Creature* creature) : ScriptedAI(creature) {} uint32 Cycle_Timer; @@ -1527,7 +1527,7 @@ class mob_phoenix_egg_tk : public CreatureScript } struct mob_phoenix_egg_tkAI : public ScriptedAI { - mob_phoenix_egg_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature) {} uint32 Rebirth_Timer; @@ -1571,9 +1571,9 @@ class mob_phoenix_egg_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_phoenix_egg_tkAI(pCreature); + return new mob_phoenix_egg_tkAI(creature); } }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index a16f2d16cfe..94ea9e0fd68 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -53,9 +53,9 @@ class boss_void_reaver : public CreatureScript struct boss_void_reaverAI : public ScriptedAI { - boss_void_reaverAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_void_reaverAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 12f95fdb4aa..e54e55789ae 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -46,7 +46,7 @@ class mob_crystalcore_devastator : public CreatureScript } struct mob_crystalcore_devastatorAI : public ScriptedAI { - mob_crystalcore_devastatorAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature) {} uint32 Knockaway_Timer; uint32 Countercharge_Timer; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index b81b74a7fa9..df7f95abe2a 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -58,7 +58,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript // Gatewatcher Iron-Hand AI struct boss_gatewatcher_iron_handAI : public ScriptedAI { - boss_gatewatcher_iron_handAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_gatewatcher_iron_handAI(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 8c5abbcadc0..a5ad891012e 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -61,9 +61,9 @@ class boss_nethermancer_sepethrea : public CreatureScript } struct boss_nethermancer_sepethreaAI : public ScriptedAI { - boss_nethermancer_sepethreaAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_nethermancer_sepethreaAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript *pInstance; @@ -183,9 +183,9 @@ class mob_ragin_flames : public CreatureScript struct mob_ragin_flamesAI : public ScriptedAI { - mob_ragin_flamesAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_ragin_flamesAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript *pInstance; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 056b46a38fd..1b2a104dc66 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -65,7 +65,7 @@ class boss_pathaleon_the_calculator : public CreatureScript struct boss_pathaleon_the_calculatorAI : public ScriptedAI { - boss_pathaleon_the_calculatorAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me) + boss_pathaleon_the_calculatorAI(Creature* creature) : ScriptedAI(creature), summons(me) { } @@ -192,9 +192,9 @@ class boss_pathaleon_the_calculator : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_pathaleon_the_calculatorAI (pCreature); + return new boss_pathaleon_the_calculatorAI (creature); } }; @@ -209,7 +209,7 @@ class mob_nether_wraith : public CreatureScript struct mob_nether_wraithAI : public ScriptedAI { - mob_nether_wraithAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_nether_wraithAI(Creature* creature) : ScriptedAI(creature) {} uint32 ArcaneMissiles_Timer; uint32 Detonation_Timer; @@ -267,9 +267,9 @@ class mob_nether_wraith : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_nether_wraithAI (pCreature); + return new mob_nether_wraithAI (creature); } }; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 2d2ac51a317..8e6c0b830e6 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -76,9 +76,9 @@ class npc_millhouse_manastorm : public CreatureScript } struct npc_millhouse_manastormAI : public ScriptedAI { - npc_millhouse_manastormAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_millhouse_manastormAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -280,9 +280,9 @@ class npc_warden_mellichar : public CreatureScript } struct npc_warden_mellicharAI : public ScriptedAI { - npc_warden_mellicharAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_warden_mellicharAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -536,7 +536,7 @@ class mob_zerekethvoidzone : public CreatureScript } struct mob_zerekethvoidzoneAI : public ScriptedAI { - mob_zerekethvoidzoneAI(Creature* pCreature) : ScriptedAI(pCreature) {} + mob_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index b0580df3e42..5fa365ac4ac 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -67,9 +67,9 @@ class boss_harbinger_skyriss : public CreatureScript } struct boss_harbinger_skyrissAI : public ScriptedAI { - boss_harbinger_skyrissAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_harbinger_skyrissAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); Intro = false; } @@ -271,9 +271,9 @@ class boss_harbinger_skyriss : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_harbinger_skyrissAI (pCreature); + return new boss_harbinger_skyrissAI (creature); } }; @@ -290,7 +290,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript } struct boss_harbinger_skyriss_illusionAI : public ScriptedAI { - boss_harbinger_skyriss_illusionAI(Creature* pCreature) : ScriptedAI(pCreature) {} + boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 3a91b23599a..e130512f08c 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -59,7 +59,7 @@ class boss_high_botanist_freywinn : public CreatureScript struct boss_high_botanist_freywinnAI : public ScriptedAI { - boss_high_botanist_freywinnAI(Creature* pCreature) : ScriptedAI(pCreature) {} + boss_high_botanist_freywinnAI(Creature* creature) : ScriptedAI(creature) {} std::list<uint64> Adds_List; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index e8adc8659c4..872421f7561 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -60,7 +60,7 @@ class boss_laj : public CreatureScript struct boss_lajAI : public ScriptedAI { - boss_lajAI(Creature* pCreature) : ScriptedAI(pCreature) {} + boss_lajAI(Creature* creature) : ScriptedAI(creature) {} bool CanSummon; uint32 Teleport_Timer; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index df6da33ad43..1acc75981e0 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -73,7 +73,7 @@ class mob_warp_splinter_treant : public CreatureScript } struct mob_warp_splinter_treantAI : public ScriptedAI { - mob_warp_splinter_treantAI (Creature* pCreature) : ScriptedAI(pCreature) + mob_warp_splinter_treantAI (Creature* creature) : ScriptedAI(creature) { WarpGuid = 0; } @@ -137,10 +137,10 @@ class boss_warp_splinter : public CreatureScript } struct boss_warp_splinterAI : public ScriptedAI { - boss_warp_splinterAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_warp_splinterAI(Creature* creature) : ScriptedAI(creature) { - Treant_Spawn_Pos_X = pCreature->GetPositionX(); - Treant_Spawn_Pos_Y = pCreature->GetPositionY(); + Treant_Spawn_Pos_X = creature->GetPositionX(); + Treant_Spawn_Pos_Y = creature->GetPositionY(); } uint32 War_Stomp_Timer; diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index d23471f596c..c9f2f859e16 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -53,9 +53,9 @@ class mobs_bladespire_ogre : public CreatureScript public: mobs_bladespire_ogre() : CreatureScript("mobs_bladespire_ogre") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mobs_bladespire_ogreAI (pCreature); + return new mobs_bladespire_ogreAI (creature); } struct mobs_bladespire_ogreAI : public ScriptedAI @@ -105,9 +105,9 @@ class mobs_nether_drake : public CreatureScript public: mobs_nether_drake() : CreatureScript("mobs_nether_drake") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mobs_nether_drakeAI (pCreature); + return new mobs_nether_drakeAI (creature); } struct mobs_nether_drakeAI : public ScriptedAI @@ -270,9 +270,9 @@ class npc_daranelle : public CreatureScript public: npc_daranelle() : CreatureScript("npc_daranelle") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_daranelleAI (pCreature); + return new npc_daranelleAI (creature); } struct npc_daranelleAI : public ScriptedAI @@ -312,23 +312,23 @@ class npc_overseer_nuaar : public CreatureScript public: npc_overseer_nuaar() : CreatureScript("npc_overseer_nuaar") { } - 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->SEND_GOSSIP_MENU(10533, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10533, creature->GetGUID()); pPlayer->AreaExploredOrEventHappens(10682); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10532, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10532, creature->GetGUID()); return true; } @@ -347,29 +347,29 @@ class npc_saikkal_the_elder : public CreatureScript public: npc_saikkal_the_elder() : CreatureScript("npc_saikkal_the_elder") { } - 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_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(10795, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10795, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); - pPlayer->SEND_GOSSIP_MENU(10796, pCreature->GetGUID()); + pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10796, creature->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10794, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10794, creature->GetGUID()); return true; } diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 0126bf3eb1b..4c2d1e0ed83 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -59,9 +59,9 @@ class npc_aeranas : public CreatureScript public: npc_aeranas() : CreatureScript("npc_aeranas") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_aeranasAI (pCreature); + return new npc_aeranasAI (creature); } struct npc_aeranasAI : public ScriptedAI @@ -147,21 +147,21 @@ class npc_ancestral_wolf : public CreatureScript public: npc_ancestral_wolf() : CreatureScript("npc_ancestral_wolf") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_ancestral_wolfAI(pCreature); + return new npc_ancestral_wolfAI(creature); } struct npc_ancestral_wolfAI : public npc_escortAI { - npc_ancestral_wolfAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_ancestral_wolfAI(Creature* creature) : npc_escortAI(creature) { - if (pCreature->GetOwner() && pCreature->GetOwner()->GetTypeId() == TYPEID_PLAYER) - Start(false, false, pCreature->GetOwner()->GetGUID()); + if (creature->GetOwner() && creature->GetOwner()->GetTypeId() == TYPEID_PLAYER) + Start(false, false, creature->GetOwner()->GetGUID()); else sLog->outError("TRINITY: npc_ancestral_wolf can not obtain owner or owner is not a player."); - pCreature->SetSpeed(MOVE_WALK, 1.5f); + creature->SetSpeed(MOVE_WALK, 1.5f); Reset(); } @@ -234,22 +234,22 @@ class npc_naladu : public CreatureScript public: npc_naladu() : CreatureScript("npc_naladu") { } - 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->SEND_GOSSIP_MENU(GOSSIP_TEXTID_NALADU1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_NALADU1, 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()); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NALADU_ITEM1, 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; } @@ -274,38 +274,38 @@ class npc_tracy_proudwell : public CreatureScript public: npc_tracy_proudwell() : CreatureScript("npc_tracy_proudwell") { } - 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_TRACY_PROUDWELL_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TRACY_PROUDWELL1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TRACY_PROUDWELL1, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_TRADE: - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(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()); - if (pCreature->isVendor()) + if (creature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_REDEEM_MARKS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (pPlayer->GetQuestStatus(QUEST_DIGGING_FOR_PRAYER_BEADS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TRACY_PROUDWELL_ITEM1, 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; } @@ -331,34 +331,34 @@ class npc_trollbane : public CreatureScript public: npc_trollbane() : CreatureScript("npc_trollbane") { } - 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_TROLLBANE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE1, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE3, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE3, 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_TROLLBANE_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -385,23 +385,23 @@ class npc_wounded_blood_elf : public CreatureScript public: npc_wounded_blood_elf() : CreatureScript("npc_wounded_blood_elf") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH) { - if (npc_escortAI* pEscortAI = CAST_AI(npc_wounded_blood_elf::npc_wounded_blood_elfAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_wounded_blood_elf::npc_wounded_blood_elfAI, creature->AI())) pEscortAI->Start(true, false, pPlayer->GetGUID()); // Change faction so mobs attack - pCreature->setFaction(775); + creature->setFaction(775); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_wounded_blood_elfAI(pCreature); + return new npc_wounded_blood_elfAI(creature); } struct npc_wounded_blood_elfAI : public npc_escortAI @@ -475,14 +475,14 @@ class npc_fel_guard_hound : public CreatureScript public: npc_fel_guard_hound() : CreatureScript("npc_fel_guard_hound") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_fel_guard_houndAI(pCreature); + return new npc_fel_guard_houndAI(creature); } struct npc_fel_guard_houndAI : public ScriptedAI { - npc_fel_guard_houndAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_fel_guard_houndAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiCheckTimer; uint64 uiHelboarGUID; diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index c9cfc7dc03a..035334e1c6e 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -47,9 +47,9 @@ class mob_shattered_rumbler : public CreatureScript public: mob_shattered_rumbler() : CreatureScript("mob_shattered_rumbler") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_shattered_rumblerAI (pCreature); + return new mob_shattered_rumblerAI (creature); } struct mob_shattered_rumblerAI : public ScriptedAI @@ -107,44 +107,44 @@ class mob_lump : public CreatureScript public: mob_lump() : CreatureScript("mob_lump") { } - 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_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9353, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9353, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9354, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9354, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(9355, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9355, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->SEND_GOSSIP_MENU(9356, pCreature->GetGUID()); - pPlayer->TalkedToCreature(18354, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9356, creature->GetGUID()); + pPlayer->TalkedToCreature(18354, creature->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9352, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9352, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_lumpAI(pCreature); + return new mob_lumpAI(creature); } struct mob_lumpAI : public ScriptedAI @@ -252,9 +252,9 @@ class mob_sunspring_villager : public CreatureScript public: mob_sunspring_villager() : CreatureScript("mob_sunspring_villager") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_sunspring_villagerAI (pCreature); + return new mob_sunspring_villagerAI (creature); } struct mob_sunspring_villagerAI : public ScriptedAI @@ -301,7 +301,7 @@ class npc_altruis_the_sufferer : public CreatureScript public: npc_altruis_the_sufferer() : CreatureScript("npc_altruis_the_sufferer") { } - bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const* /*quest*/) + bool OnQuestAccept(Player* pPlayer, Creature* /*creature*/, Quest const* /*quest*/) { if (!pPlayer->GetQuestRewardStatus(9991)) //Survey the Land, q-id 9991 { @@ -311,34 +311,34 @@ public: 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+10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(9420, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9420, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(9421, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9421, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+12: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(9422, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9422, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+13: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); - pPlayer->SEND_GOSSIP_MENU(9423, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9423, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+14: - pPlayer->SEND_GOSSIP_MENU(9424, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9424, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+20: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); - pPlayer->SEND_GOSSIP_MENU(9427, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9427, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+21: pPlayer->CLOSE_GOSSIP_MENU(); @@ -347,7 +347,7 @@ public: case GOSSIP_ACTION_INFO_DEF+30: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31); - pPlayer->SEND_GOSSIP_MENU(384, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(384, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+31: pPlayer->CLOSE_GOSSIP_MENU(); @@ -357,10 +357,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()); //gossip before obtaining Survey the Land if (pPlayer->GetQuestStatus(9991) == QUEST_STATUS_NONE) @@ -374,7 +374,7 @@ public: if (pPlayer->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30); - pPlayer->SEND_GOSSIP_MENU(9419, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9419, creature->GetGUID()); return true; } @@ -406,34 +406,34 @@ class npc_greatmother_geyah : public CreatureScript public: npc_greatmother_geyah() : CreatureScript("npc_greatmother_geyah") { } - 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_SGG1, 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()); break; case GOSSIP_ACTION_INFO_DEF + 2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: pPlayer->AreaExploredOrEventHappens(10044); @@ -442,23 +442,23 @@ public: case GOSSIP_ACTION_INFO_DEF + 10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 14: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 15: pPlayer->AreaExploredOrEventHappens(10172); @@ -468,24 +468,24 @@ 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(10044) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG1, 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()); } else if (pPlayer->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -510,41 +510,41 @@ class npc_lantresor_of_the_blade : public CreatureScript public: npc_lantresor_of_the_blade() : CreatureScript("npc_lantresor_of_the_blade") { } - 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_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9362, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9362, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9363, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9363, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(9364, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9364, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(9365, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9365, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(9366, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9366, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(9367, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9367, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(9368, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9368, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: - pPlayer->SEND_GOSSIP_MENU(9369, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9369, creature->GetGUID()); if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE) pPlayer->AreaExploredOrEventHappens(10107); if (pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) @@ -554,15 +554,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(10107) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9361, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9361, creature->GetGUID()); return true; } @@ -604,35 +604,35 @@ class npc_maghar_captive : public CreatureScript public: npc_maghar_captive() : CreatureScript("npc_maghar_captive") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { - if (npc_maghar_captiveAI* pEscortAI = dynamic_cast<npc_maghar_captiveAI*>(pCreature->AI())) + if (npc_maghar_captiveAI* pEscortAI = dynamic_cast<npc_maghar_captiveAI*>(creature->AI())) { - pCreature->SetStandState(UNIT_STAND_STATE_STAND); - pCreature->setFaction(232); + creature->SetStandState(UNIT_STAND_STATE_STAND); + creature->setFaction(232); pEscortAI->Start(true, false, pPlayer->GetGUID(), pQuest); - DoScriptText(SAY_MAG_START, pCreature); + DoScriptText(SAY_MAG_START, creature); - pCreature->SummonCreature(NPC_MURK_RAIDER, m_afAmbushA[0]+2.5f, m_afAmbushA[1]-2.5f, m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - pCreature->SummonCreature(NPC_MURK_PUTRIFIER, m_afAmbushA[0]-2.5f, m_afAmbushA[1]+2.5f, m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - pCreature->SummonCreature(NPC_MURK_BRUTE, m_afAmbushA[0], m_afAmbushA[1], m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + creature->SummonCreature(NPC_MURK_RAIDER, m_afAmbushA[0]+2.5f, m_afAmbushA[1]-2.5f, m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + creature->SummonCreature(NPC_MURK_PUTRIFIER, m_afAmbushA[0]-2.5f, m_afAmbushA[1]+2.5f, m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + creature->SummonCreature(NPC_MURK_BRUTE, m_afAmbushA[0], m_afAmbushA[1], m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); } } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_maghar_captiveAI(pCreature); + return new npc_maghar_captiveAI(creature); } struct npc_maghar_captiveAI : public npc_escortAI { - npc_maghar_captiveAI(Creature* pCreature) : npc_escortAI(pCreature) { Reset(); } + npc_maghar_captiveAI(Creature* creature) : npc_escortAI(creature) { Reset(); } uint32 m_uiChainLightningTimer; uint32 m_uiHealTimer; @@ -749,9 +749,9 @@ class npc_creditmarker_visit_with_ancestors : public CreatureScript public: npc_creditmarker_visit_with_ancestors() : CreatureScript("npc_creditmarker_visit_with_ancestors") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_creditmarker_visit_with_ancestorsAI (pCreature); + return new npc_creditmarker_visit_with_ancestorsAI (creature); } struct npc_creditmarker_visit_with_ancestorsAI : public ScriptedAI @@ -797,9 +797,9 @@ class mob_sparrowhawk : public CreatureScript public: mob_sparrowhawk() : CreatureScript("mob_sparrowhawk") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_sparrowhawkAI (pCreature); + return new mob_sparrowhawkAI (creature); } struct mob_sparrowhawkAI : public ScriptedAI diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index d9322384d40..eef1036271d 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -70,9 +70,9 @@ class npc_manaforge_control_console : public CreatureScript public: npc_manaforge_control_console() : CreatureScript("npc_manaforge_control_console") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_manaforge_control_consoleAI (pCreature); + return new npc_manaforge_control_consoleAI (creature); } struct npc_manaforge_control_consoleAI : public ScriptedAI @@ -146,9 +146,9 @@ public: } } - void DoWaveSpawnForCreature(Creature* pCreature) + void DoWaveSpawnForCreature(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: if (rand()%2) @@ -200,9 +200,9 @@ public: break; } } - void DoFinalSpawnForCreature(Creature* pCreature) + void DoFinalSpawnForCreature(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2946.52f, 4201.42f, 163.47f, 3.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); @@ -388,9 +388,9 @@ class npc_commander_dawnforge : public CreatureScript public: npc_commander_dawnforge() : CreatureScript("npc_commander_dawnforge") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_commander_dawnforgeAI(pCreature); + return new npc_commander_dawnforgeAI(creature); } struct npc_commander_dawnforgeAI : public ScriptedAI @@ -681,35 +681,35 @@ class npc_professor_dabiri : public CreatureScript public: npc_professor_dabiri() : CreatureScript("npc_professor_dabiri") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) { if (quest->GetQuestId() == QUEST_DIMENSIUS) - DoScriptText(WHISPER_DABIRI, pCreature, pPlayer); + DoScriptText(WHISPER_DABIRI, creature, pPlayer); 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) { - pCreature->CastSpell(pPlayer, SPELL_PHASE_DISTRUPTOR, false); + creature->CastSpell(pPlayer, SPELL_PHASE_DISTRUPTOR, false); pPlayer->CLOSE_GOSSIP_MENU(); } 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_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(29778, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, 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; } @@ -742,9 +742,9 @@ class mob_phase_hunter : public CreatureScript public: mob_phase_hunter() : CreatureScript("mob_phase_hunter") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_phase_hunterAI (pCreature); + return new mob_phase_hunterAI (creature); } struct mob_phase_hunterAI : public ScriptedAI @@ -871,20 +871,20 @@ class npc_bessy : public CreatureScript public: npc_bessy() : CreatureScript("npc_bessy") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == Q_ALMABTRIEB) { - pCreature->setFaction(113); - pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); + creature->setFaction(113); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_bessyAI(pCreature); + return new npc_bessyAI(creature); } struct npc_bessyAI : public npc_escortAI @@ -958,14 +958,14 @@ class npc_maxx_a_million_escort : public CreatureScript public: npc_maxx_a_million_escort() : CreatureScript("npc_maxx_a_million_escort") { } - CreatureAI *GetAI(Creature* pCreature) const + CreatureAI *GetAI(Creature* creature) const { - return new npc_maxx_a_million_escortAI(pCreature); + return new npc_maxx_a_million_escortAI(creature); } struct npc_maxx_a_million_escortAI : public npc_escortAI { - npc_maxx_a_million_escortAI(Creature* pCreature) : npc_escortAI(pCreature) {} + npc_maxx_a_million_escortAI(Creature* creature) : npc_escortAI(creature) {} bool bTake; uint32 uiTakeTimer; @@ -1034,13 +1034,13 @@ public: } }; - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) { - if (npc_maxx_a_million_escortAI* pEscortAI = CAST_AI(npc_maxx_a_million_escort::npc_maxx_a_million_escortAI, pCreature->AI())) + if (npc_maxx_a_million_escortAI* pEscortAI = CAST_AI(npc_maxx_a_million_escort::npc_maxx_a_million_escortAI, creature->AI())) { - pCreature->setFaction(113); + creature->setFaction(113); pEscortAI->Start(false, false, pPlayer->GetGUID()); } } diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 070b769e8f9..b8a893aeedc 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -68,9 +68,9 @@ class mob_mature_netherwing_drake : public CreatureScript public: mob_mature_netherwing_drake() : CreatureScript("mob_mature_netherwing_drake") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_mature_netherwing_drakeAI(pCreature); + return new mob_mature_netherwing_drakeAI(creature); } struct mob_mature_netherwing_drakeAI : public ScriptedAI @@ -200,9 +200,9 @@ class mob_enslaved_netherwing_drake : public CreatureScript public: mob_enslaved_netherwing_drake() : CreatureScript("mob_enslaved_netherwing_drake") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_enslaved_netherwing_drakeAI(pCreature); + return new mob_enslaved_netherwing_drakeAI(creature); } struct mob_enslaved_netherwing_drakeAI : public ScriptedAI @@ -333,9 +333,9 @@ class mob_dragonmaw_peon : public CreatureScript public: mob_dragonmaw_peon() : CreatureScript("mob_dragonmaw_peon") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_dragonmaw_peonAI(pCreature); + return new mob_dragonmaw_peonAI(creature); } struct mob_dragonmaw_peonAI : public ScriptedAI @@ -413,21 +413,21 @@ class npc_drake_dealer_hurlunk : public CreatureScript public: npc_drake_dealer_hurlunk() : CreatureScript("npc_drake_dealer_hurlunk") { } - 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->isVendor() && pPlayer->GetReputationRank(1015) == REP_EXALTED) + if (creature->isVendor() && pPlayer->GetReputationRank(1015) == REP_EXALTED) 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; } @@ -446,7 +446,7 @@ class npcs_flanis_swiftwing_and_kagrosh : public CreatureScript public: npcs_flanis_swiftwing_and_kagrosh() : CreatureScript("npcs_flanis_swiftwing_and_kagrosh") { } - 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) @@ -472,14 +472,14 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658, 1, true)) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659, 1, true)) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK2, 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; } @@ -504,7 +504,7 @@ class npc_murkblood_overseer : public CreatureScript public: npc_murkblood_overseer() : CreatureScript("npc_murkblood_overseer") { } - 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) @@ -512,44 +512,44 @@ public: case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); - pCreature->CastSpell(pPlayer, 41121, false); + pPlayer->SEND_GOSSIP_MENU(10940, creature->GetGUID()); + creature->CastSpell(pPlayer, 41121, false); pPlayer->AreaExploredOrEventHappens(QUEST_11082); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, creature->GetGUID()); return true; } @@ -572,37 +572,37 @@ class npc_oronok_tornheart : public CreatureScript public: npc_oronok_tornheart() : CreatureScript("npc_oronok_tornheart") { } - 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: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10313, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10313, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(10314, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10314, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(10315, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10315, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(10316, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10316, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(10317, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10317, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(10318, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10318, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->CLOSE_GOSSIP_MENU(); @@ -612,19 +612,19 @@ public: 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->GetQuestStatus(10519) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(10312, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10312, creature->GetGUID()); }else - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -647,7 +647,7 @@ class npc_karynaku : public CreatureScript public: npc_karynaku() : CreatureScript("npc_karynaku") { } - bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* /*creature*/, Quest const* quest) { if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER) pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID); //pPlayer->ActivateTaxiPathTo(649); @@ -698,20 +698,20 @@ class npc_overlord_morghor : public CreatureScript public: npc_overlord_morghor() : CreatureScript("npc_overlord_morghor") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest *_Quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest *_Quest) { if (_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE) { - CAST_AI(npc_overlord_morghor::npc_overlord_morghorAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); - CAST_AI(npc_overlord_morghor::npc_overlord_morghorAI, pCreature->AI())->StartEvent(); + CAST_AI(npc_overlord_morghor::npc_overlord_morghorAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_overlord_morghor::npc_overlord_morghorAI, creature->AI())->StartEvent(); return true; } return false; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_overlord_morghorAI(pCreature); + return new npc_overlord_morghorAI(creature); } struct npc_overlord_morghorAI : public ScriptedAI @@ -914,27 +914,27 @@ class npc_earthmender_wilda : public CreatureScript public: npc_earthmender_wilda() : CreatureScript("npc_earthmender_wilda") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_ESCAPE_COILSCAR) { - DoScriptText(SAY_WIL_START, pCreature, pPlayer); - pCreature->setFaction(FACTION_EARTHEN); + DoScriptText(SAY_WIL_START, creature, pPlayer); + creature->setFaction(FACTION_EARTHEN); - if (npc_earthmender_wildaAI* pEscortAI = CAST_AI(npc_earthmender_wilda::npc_earthmender_wildaAI, pCreature->AI())) + if (npc_earthmender_wildaAI* pEscortAI = CAST_AI(npc_earthmender_wilda::npc_earthmender_wildaAI, creature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_earthmender_wildaAI(pCreature); + return new npc_earthmender_wildaAI(creature); } struct npc_earthmender_wildaAI : public npc_escortAI { - npc_earthmender_wildaAI(Creature* pCreature) : npc_escortAI(pCreature) { } + npc_earthmender_wildaAI(Creature* creature) : npc_escortAI(creature) { } uint32 m_uiHealingTimer; @@ -1081,7 +1081,7 @@ EndContentData */ struct TorlothCinematic { int32 TextId; - uint32 pCreature, Timer; + uint32 creature, Timer; }; // Creature 0 - Torloth, 1 - Illidan @@ -1200,18 +1200,18 @@ public: void HandleAnimation() { - Creature* pCreature = me; + Creature* creature = me; - if (TorlothAnim[AnimationCount].pCreature == 1) + if (TorlothAnim[AnimationCount].creature == 1) { - pCreature = (Unit::GetCreature(*me, LordIllidanGUID)); + creature = (Unit::GetCreature(*me, LordIllidanGUID)); - if (!pCreature) + if (!creature) return; } if (TorlothAnim[AnimationCount].TextId) - DoScriptText(TorlothAnim[AnimationCount].TextId, pCreature); + DoScriptText(TorlothAnim[AnimationCount].TextId, creature); AnimationTimer = TorlothAnim[AnimationCount].Timer; @@ -1728,9 +1728,9 @@ class npc_enraged_spirit : public CreatureScript public: npc_enraged_spirit() : CreatureScript("npc_enraged_spirit") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_enraged_spiritAI(pCreature); + return new npc_enraged_spiritAI(creature); } struct npc_enraged_spiritAI : public ScriptedAI diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index f7cd1b832aa..cf547ea2c36 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -55,30 +55,30 @@ class npc_raliq_the_drunk : public CreatureScript public: npc_raliq_the_drunk() : CreatureScript("npc_raliq_the_drunk") { } - 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->setFaction(FACTION_HOSTILE_RD); - pCreature->AI()->AttackStart(pPlayer); + creature->setFaction(FACTION_HOSTILE_RD); + creature->AI()->AttackStart(pPlayer); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9440, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9440, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_raliq_the_drunkAI (pCreature); + return new npc_raliq_the_drunkAI (creature); } struct npc_raliq_the_drunkAI : public ScriptedAI @@ -129,25 +129,25 @@ class npc_salsalabim : public CreatureScript public: npc_salsalabim() : CreatureScript("npc_salsalabim") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE) { - pCreature->setFaction(FACTION_HOSTILE_SA); - pCreature->AI()->AttackStart(pPlayer); + creature->setFaction(FACTION_HOSTILE_SA); + creature->AI()->AttackStart(pPlayer); } else { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->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_salsalabimAI (pCreature); + return new npc_salsalabimAI (creature); } struct npc_salsalabimAI : public ScriptedAI @@ -206,42 +206,42 @@ class npc_shattrathflaskvendors : public CreatureScript public: npc_shattrathflaskvendors() : CreatureScript("npc_shattrathflaskvendors") { } - 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->GetEntry() == 23484) + if (creature->GetEntry() == 23484) { // Aldor vendor - if (pCreature->isVendor() && (pPlayer->GetReputationRank(932) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) + if (creature->isVendor() && (pPlayer->GetReputationRank(932) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(11085, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(11085, creature->GetGUID()); } else { - pPlayer->SEND_GOSSIP_MENU(11083, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(11083, creature->GetGUID()); } } - if (pCreature->GetEntry() == 23483) + if (creature->GetEntry() == 23483) { // Scryers vendor - if (pCreature->isVendor() && (pPlayer->GetReputationRank(934) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) + if (creature->isVendor() && (pPlayer->GetReputationRank(934) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(11085, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(11085, creature->GetGUID()); } else { - pPlayer->SEND_GOSSIP_MENU(11084, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(11084, creature->GetGUID()); } } @@ -261,7 +261,7 @@ class npc_zephyr : public CreatureScript public: npc_zephyr() : CreatureScript("npc_zephyr") { } - 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) @@ -270,12 +270,12 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetReputationRank(989) >= REP_REVERED) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, 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; } @@ -313,9 +313,9 @@ class npc_kservant : public CreatureScript public: npc_kservant() : CreatureScript("npc_kservant") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_kservantAI(pCreature); + return new npc_kservantAI(creature); } struct npc_kservantAI : public npc_escortAI @@ -543,34 +543,34 @@ public: } }; - 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) { - CAST_AI(npc_dirty_larry::npc_dirty_larryAI, pCreature->AI())->Event = true; - CAST_AI(npc_dirty_larry::npc_dirty_larryAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_dirty_larry::npc_dirty_larryAI, creature->AI())->Event = true; + CAST_AI(npc_dirty_larry::npc_dirty_larryAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); pPlayer->CLOSE_GOSSIP_MENU(); } 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_WBI) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOOK, 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_dirty_larryAI (pCreature); + return new npc_dirty_larryAI (creature); } }; @@ -587,26 +587,26 @@ class npc_ishanah : public CreatureScript public: npc_ishanah() : CreatureScript("npc_ishanah") { } - 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->SEND_GOSSIP_MENU(9458, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9458, creature->GetGUID()); else if (uiAction == GOSSIP_ACTION_INFO_DEF+2) - pPlayer->SEND_GOSSIP_MENU(9459, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9459, 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()); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_2, 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; } @@ -629,52 +629,52 @@ class npc_khadgar : public CreatureScript public: npc_khadgar() : CreatureScript("npc_khadgar") { } - 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, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(9876, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9876, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(9877, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9877, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(9878, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9878, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(9879, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9879, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(9880, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9880, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - pPlayer->SEND_GOSSIP_MENU(9881, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9881, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9243, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9243, 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()); if (!pPlayer->hasQuest(10211)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9243, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9243, creature->GetGUID()); return true; } diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 74615f3e27e..f807eb0422d 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -55,9 +55,9 @@ class mob_unkor_the_ruthless : public CreatureScript public: mob_unkor_the_ruthless() : CreatureScript("mob_unkor_the_ruthless") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_unkor_the_ruthlessAI (pCreature); + return new mob_unkor_the_ruthlessAI (creature); } struct mob_unkor_the_ruthlessAI : public ScriptedAI @@ -162,9 +162,9 @@ class mob_infested_root_walker : public CreatureScript public: mob_infested_root_walker() : CreatureScript("mob_infested_root_walker") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_infested_root_walkerAI (pCreature); + return new mob_infested_root_walkerAI (creature); } struct mob_infested_root_walkerAI : public ScriptedAI @@ -194,9 +194,9 @@ class npc_skywing : public CreatureScript public: npc_skywing() : CreatureScript("npc_skywing") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_skywingAI(pCreature); + return new npc_skywingAI(creature); } struct npc_skywingAI : public npc_escortAI @@ -257,9 +257,9 @@ class mob_rotting_forest_rager : public CreatureScript public: mob_rotting_forest_rager() : CreatureScript("mob_rotting_forest_rager") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_rotting_forest_ragerAI (pCreature); + return new mob_rotting_forest_ragerAI (creature); } struct mob_rotting_forest_ragerAI : public ScriptedAI @@ -297,9 +297,9 @@ class mob_netherweb_victim : public CreatureScript public: mob_netherweb_victim() : CreatureScript("mob_netherweb_victim") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_netherweb_victimAI (pCreature); + return new mob_netherweb_victimAI (creature); } struct mob_netherweb_victimAI : public ScriptedAI @@ -358,36 +358,36 @@ class npc_floon : public CreatureScript public: npc_floon() : CreatureScript("npc_floon") { } - 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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9443, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9443, creature->GetGUID()); } if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->setFaction(FACTION_HOSTILE_FL); - DoScriptText(SAY_FLOON_ATTACK, pCreature, pPlayer); - pCreature->AI()->AttackStart(pPlayer); + creature->setFaction(FACTION_HOSTILE_FL); + DoScriptText(SAY_FLOON_ATTACK, creature, pPlayer); + creature->AI()->AttackStart(pPlayer); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9442, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9442, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_floonAI (pCreature); + return new npc_floonAI (creature); } struct npc_floonAI : public ScriptedAI @@ -518,19 +518,19 @@ public: } }; - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A) { - CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); - pCreature->setFaction(113); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); + creature->setFaction(113); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_isla_starmaneAI(pCreature); + return new npc_isla_starmaneAI(creature); } }; @@ -606,24 +606,24 @@ class npc_slim : public CreatureScript public: npc_slim() : CreatureScript("npc_slim") { } - 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->isVendor() && pPlayer->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) + if (creature->isVendor() && pPlayer->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(9896, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9896, creature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(9895, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9895, creature->GetGUID()); return true; } @@ -645,24 +645,24 @@ class npc_akuno : public CreatureScript public: npc_akuno() : CreatureScript("npc_akuno") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) { if (pQuest->GetQuestId() == QUEST_ESCAPING_THE_TOMB) { - if (npc_akunoAI* pEscortAI = CAST_AI(npc_akuno::npc_akunoAI, pCreature->AI())) + if (npc_akunoAI* pEscortAI = CAST_AI(npc_akuno::npc_akunoAI, creature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID()); if (pPlayer->GetTeamId() == TEAM_ALLIANCE) - pCreature->setFaction(FACTION_ESCORT_A_NEUTRAL_PASSIVE); + creature->setFaction(FACTION_ESCORT_A_NEUTRAL_PASSIVE); else - pCreature->setFaction(FACTION_ESCORT_H_NEUTRAL_PASSIVE); + creature->setFaction(FACTION_ESCORT_H_NEUTRAL_PASSIVE); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_akunoAI(pCreature); + return new npc_akunoAI(creature); } struct npc_akunoAI : public npc_escortAI diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 3c2f4c991ee..15bae699d4e 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -50,80 +50,80 @@ class npcs_ashyen_and_keleth : public CreatureScript public: npcs_ashyen_and_keleth() : CreatureScript("npcs_ashyen_and_keleth") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetReputationRank(942) > REP_NEUTRAL) { - if (pCreature->GetEntry() == 17900) + if (creature->GetEntry() == 17900) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_ASH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - if (pCreature->GetEntry() == 17901) + if (creature->GetEntry() == 17901) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_KEL, 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) { - pCreature->setPowerType(POWER_MANA); - pCreature->SetMaxPower(POWER_MANA, 200); //set a "fake" mana value, we can't depend on database doing it in this case - pCreature->SetPower(POWER_MANA, 200); + creature->setPowerType(POWER_MANA); + creature->SetMaxPower(POWER_MANA, 200); //set a "fake" mana value, we can't depend on database doing it in this case + creature->SetPower(POWER_MANA, 200); - if (pCreature->GetEntry() == 17900) //check which Creature we are dealing with + if (creature->GetEntry() == 17900) //check which Creature we are dealing with { switch (pPlayer->GetReputationRank(942)) { //mark of lore case REP_FRIENDLY: - pCreature->CastSpell(pPlayer, 31808, true); - DoScriptText(GOSSIP_REWARD_BLESS, pCreature); + creature->CastSpell(pPlayer, 31808, true); + DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_HONORED: - pCreature->CastSpell(pPlayer, 31810, true); - DoScriptText(GOSSIP_REWARD_BLESS, pCreature); + creature->CastSpell(pPlayer, 31810, true); + DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_REVERED: - pCreature->CastSpell(pPlayer, 31811, true); - DoScriptText(GOSSIP_REWARD_BLESS, pCreature); + creature->CastSpell(pPlayer, 31811, true); + DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_EXALTED: - pCreature->CastSpell(pPlayer, 31815, true); - DoScriptText(GOSSIP_REWARD_BLESS, pCreature); + creature->CastSpell(pPlayer, 31815, true); + DoScriptText(GOSSIP_REWARD_BLESS, creature); break; default: break; } } - if (pCreature->GetEntry() == 17901) + if (creature->GetEntry() == 17901) { switch (pPlayer->GetReputationRank(942)) //mark of war { case REP_FRIENDLY: - pCreature->CastSpell(pPlayer, 31807, true); - DoScriptText(GOSSIP_REWARD_BLESS, pCreature); + creature->CastSpell(pPlayer, 31807, true); + DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_HONORED: - pCreature->CastSpell(pPlayer, 31812, true); - DoScriptText(GOSSIP_REWARD_BLESS, pCreature); + creature->CastSpell(pPlayer, 31812, true); + DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_REVERED: - pCreature->CastSpell(pPlayer, 31813, true); - DoScriptText(GOSSIP_REWARD_BLESS, pCreature); + creature->CastSpell(pPlayer, 31813, true); + DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_EXALTED: - pCreature->CastSpell(pPlayer, 31814, true); - DoScriptText(GOSSIP_REWARD_BLESS, pCreature); + creature->CastSpell(pPlayer, 31814, true); + DoScriptText(GOSSIP_REWARD_BLESS, creature); break; default: break; } } pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); + pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); } return true; } @@ -181,28 +181,28 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_cooshcooshAI (pCreature); + return new npc_cooshcooshAI (creature); } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9441, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9441, 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) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->setFaction(FACTION_HOSTILE_CO); - pCreature->AI()->AttackStart(pPlayer); + creature->setFaction(FACTION_HOSTILE_CO); + creature->AI()->AttackStart(pPlayer); } return true; } @@ -221,28 +221,28 @@ class npc_elder_kuruti : public CreatureScript public: npc_elder_kuruti() : CreatureScript("npc_elder_kuruti") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9226, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9226, 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: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9227, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9227, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9229, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9229, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: { @@ -258,7 +258,7 @@ public: else pPlayer->SendEquipError(msg, NULL, NULL, itemId); } - pPlayer->SEND_GOSSIP_MENU(9231, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9231, creature->GetGUID()); break; } } @@ -274,21 +274,21 @@ class npc_mortog_steamhead : public CreatureScript public: npc_mortog_steamhead() : CreatureScript("npc_mortog_steamhead") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isVendor() && pPlayer->GetReputationRank(942) == REP_EXALTED) + if (creature->isVendor() && pPlayer->GetReputationRank(942) == REP_EXALTED) 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; } - 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; } }; @@ -356,21 +356,21 @@ public: } }; - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) { if (pQuest->GetQuestId() == QUEST_ESCAPE_FROM) { - DoScriptText(SAY_START, pCreature, pPlayer); + DoScriptText(SAY_START, creature, pPlayer); - if (npc_escortAI* pEscortAI = CAST_AI(npc_kayra_longmane::npc_kayra_longmaneAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_kayra_longmane::npc_kayra_longmaneAI, creature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID()); } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_kayra_longmaneAI(pCreature); + return new npc_kayra_longmaneAI(creature); } }; @@ -391,29 +391,29 @@ class npc_timothy_daniels : public CreatureScript public: npc_timothy_daniels() : CreatureScript("npc_timothy_daniels") { } - 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()) + if (creature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_POISONS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TIMOTHY_DANIELS_ITEM1, 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(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, creature->GetGUID()); break; case GOSSIP_ACTION_TRADE: - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(creature->GetGUID()); break; } |
