diff options
Diffstat (limited to 'src/server/scripts/Northrend')
84 files changed, 858 insertions, 858 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 1800c204e38..7a5db139eb6 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -67,9 +67,9 @@ public: struct boss_volazjAI : public ScriptedAI { - boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_volazjAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript *pInstance; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index cdd2b2e0cde..d43d19fd239 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -216,16 +216,16 @@ class boss_sartharion : public CreatureScript public: boss_sartharion() : CreatureScript("boss_sartharion") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_sartharionAI(pCreature); + return new boss_sartharionAI(creature); } struct boss_sartharionAI : public ScriptedAI { - boss_sartharionAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_sartharionAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -730,9 +730,9 @@ enum VespText //to control each dragons common abilities struct dummy_dragonAI : public ScriptedAI { - dummy_dragonAI(Creature* pCreature) : ScriptedAI(pCreature) + dummy_dragonAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -989,14 +989,14 @@ class mob_tenebron : public CreatureScript public: mob_tenebron() : CreatureScript("mob_tenebron") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_tenebronAI(pCreature); + return new mob_tenebronAI(creature); } struct mob_tenebronAI : public dummy_dragonAI { - mob_tenebronAI(Creature* pCreature) : dummy_dragonAI(pCreature) {} + mob_tenebronAI(Creature* creature) : dummy_dragonAI(creature) {} uint32 m_uiShadowBreathTimer; uint32 m_uiShadowFissureTimer; @@ -1079,14 +1079,14 @@ class mob_shadron : public CreatureScript public: mob_shadron() : CreatureScript("mob_shadron") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_shadronAI(pCreature); + return new mob_shadronAI(creature); } struct mob_shadronAI : public dummy_dragonAI { - mob_shadronAI(Creature* pCreature) : dummy_dragonAI(pCreature) {} + mob_shadronAI(Creature* creature) : dummy_dragonAI(creature) {} uint32 m_uiShadowBreathTimer; uint32 m_uiShadowFissureTimer; @@ -1184,14 +1184,14 @@ class mob_vesperon : public CreatureScript public: mob_vesperon() : CreatureScript("mob_vesperon") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_vesperonAI(pCreature); + return new mob_vesperonAI(creature); } struct mob_vesperonAI : public dummy_dragonAI { - mob_vesperonAI(Creature* pCreature) : dummy_dragonAI(pCreature) {} + mob_vesperonAI(Creature* creature) : dummy_dragonAI(creature) {} uint32 m_uiShadowBreathTimer; uint32 m_uiShadowFissureTimer; @@ -1280,16 +1280,16 @@ class mob_acolyte_of_shadron : public CreatureScript public: mob_acolyte_of_shadron() : CreatureScript("mob_acolyte_of_shadron") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_acolyte_of_shadronAI(pCreature); + return new mob_acolyte_of_shadronAI(creature); } struct mob_acolyte_of_shadronAI : public ScriptedAI { - mob_acolyte_of_shadronAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_acolyte_of_shadronAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -1390,16 +1390,16 @@ class mob_acolyte_of_vesperon : public CreatureScript public: mob_acolyte_of_vesperon() : CreatureScript("mob_acolyte_of_vesperon") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_acolyte_of_vesperonAI(pCreature); + return new mob_acolyte_of_vesperonAI(creature); } struct mob_acolyte_of_vesperonAI : public ScriptedAI { - mob_acolyte_of_vesperonAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_acolyte_of_vesperonAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -1485,16 +1485,16 @@ class mob_twilight_eggs : public CreatureScript public: mob_twilight_eggs() : CreatureScript("mob_twilight_eggs") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_twilight_eggsAI(pCreature); + return new mob_twilight_eggsAI(creature); } struct mob_twilight_eggsAI : public Scripted_NoMovementAI { - mob_twilight_eggsAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) + mob_twilight_eggsAI(Creature* creature) : Scripted_NoMovementAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } uint32 m_uiFadeArmorTimer; @@ -1555,14 +1555,14 @@ class npc_flame_tsunami : public CreatureScript public: npc_flame_tsunami() : CreatureScript("npc_flame_tsunami") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_flame_tsunamiAI(pCreature); + return new npc_flame_tsunamiAI(creature); } struct npc_flame_tsunamiAI : public ScriptedAI { - npc_flame_tsunamiAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_flame_tsunamiAI(Creature* creature) : ScriptedAI(creature) { me->SetDisplayId(11686); me->AddAura(SPELL_FLAME_TSUNAMI, me); @@ -1607,14 +1607,14 @@ class npc_twilight_fissure : public CreatureScript public: npc_twilight_fissure() : CreatureScript("npc_twilight_fissure") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_twilight_fissureAI(pCreature); + return new npc_twilight_fissureAI(creature); } struct npc_twilight_fissureAI : public Scripted_NoMovementAI { - npc_twilight_fissureAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) + npc_twilight_fissureAI(Creature* creature) : Scripted_NoMovementAI(creature) { Reset(); } @@ -1656,14 +1656,14 @@ class mob_twilight_whelp : public CreatureScript public: mob_twilight_whelp() : CreatureScript("mob_twilight_whelp") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_twilight_whelpAI(pCreature); + return new mob_twilight_whelpAI(creature); } struct mob_twilight_whelpAI : public ScriptedAI { - mob_twilight_whelpAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_twilight_whelpAI(Creature* creature) : ScriptedAI(creature) { Reset(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 8ac4fdb899d..90f7c299e93 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -100,11 +100,11 @@ public: boss_eadric() : CreatureScript("boss_eadric") { } struct boss_eadricAI : public ScriptedAI { - boss_eadricAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_eadricAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); - pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + pInstance = creature->GetInstanceScript(); + creature->SetReactState(REACT_PASSIVE); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } InstanceScript* pInstance; @@ -192,9 +192,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_eadricAI(pCreature); + return new boss_eadricAI(creature); } }; @@ -205,14 +205,14 @@ public: struct boss_paletressAI : public ScriptedAI { - boss_paletressAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_paletressAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); MemoryGUID = 0; - pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pCreature->RestoreFaction(); + creature->SetReactState(REACT_PASSIVE); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->RestoreFaction(); } InstanceScript* pInstance; @@ -352,9 +352,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_paletressAI(pCreature); + return new boss_paletressAI(creature); } }; @@ -365,7 +365,7 @@ public: struct npc_memoryAI : public ScriptedAI { - npc_memoryAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_memoryAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiOldWoundsTimer; uint32 uiShadowPastTimer; @@ -421,9 +421,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_memoryAI(pCreature); + return new npc_memoryAI(creature); } }; @@ -435,9 +435,9 @@ public: // THIS AI NEEDS MORE IMPROVEMENTS struct npc_argent_soldierAI : public npc_escortAI { - npc_argent_soldierAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_argent_soldierAI(Creature* creature) : npc_escortAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); me->SetReactState(REACT_DEFENSIVE); SetDespawnAtEnd(false); uiWaypoint = 0; @@ -537,9 +537,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_argent_soldierAI(pCreature); + return new npc_argent_soldierAI(creature); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index b5d0c9504ef..5d3a53c4472 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -78,9 +78,9 @@ public: struct boss_black_knightAI : public ScriptedAI { - boss_black_knightAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_black_knightAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -293,9 +293,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_black_knightAI (pCreature); + return new boss_black_knightAI (creature); } }; @@ -306,7 +306,7 @@ public: struct npc_risen_ghoulAI : public ScriptedAI { - npc_risen_ghoulAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_risen_ghoulAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiAttackTimer; @@ -334,9 +334,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_risen_ghoulAI(pCreature); + return new npc_risen_ghoulAI(creature); } }; @@ -347,7 +347,7 @@ public: struct npc_black_knight_skeletal_gryphonAI : public npc_escortAI { - npc_black_knight_skeletal_gryphonAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_black_knight_skeletal_gryphonAI(Creature* creature) : npc_escortAI(creature) { Start(false, true, 0, NULL); } @@ -367,9 +367,9 @@ public: }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_black_knight_skeletal_gryphonAI(pCreature); + return new npc_black_knight_skeletal_gryphonAI(creature); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 3b2ba1294f5..2d60f627037 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -151,12 +151,12 @@ public: struct generic_vehicleAI_toc5AI : public npc_escortAI { - generic_vehicleAI_toc5AI(Creature* pCreature) : npc_escortAI(pCreature) + generic_vehicleAI_toc5AI(Creature* creature) : npc_escortAI(creature) { SetDespawnAtEnd(false); uiWaypointPath = 0; - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -294,9 +294,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new generic_vehicleAI_toc5AI(pCreature); + return new generic_vehicleAI_toc5AI(creature); } }; @@ -308,9 +308,9 @@ public: // Marshal Jacob Alerius && Mokra the Skullcrusher || Warrior struct boss_warrior_toc5AI : public ScriptedAI { - boss_warrior_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + boss_warrior_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -427,9 +427,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_warrior_toc5AI(pCreature); + return new boss_warrior_toc5AI(creature); } }; @@ -441,9 +441,9 @@ public: // Ambrose Boltspark && Eressea Dawnsinger || Mage struct boss_mage_toc5AI : public ScriptedAI { - boss_mage_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + boss_mage_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -566,9 +566,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_mage_toc5AI(pCreature); + return new boss_mage_toc5AI(creature); } }; @@ -580,9 +580,9 @@ public: // Colosos && Runok Wildmane || Shaman struct boss_shaman_toc5AI : public ScriptedAI { - boss_shaman_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + boss_shaman_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -713,9 +713,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_shaman_toc5AI(pCreature); + return new boss_shaman_toc5AI(creature); } }; @@ -727,9 +727,9 @@ public: // Jaelyne Evensong && Zul'tore || Hunter struct boss_hunter_toc5AI : public ScriptedAI { - boss_hunter_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + boss_hunter_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -868,9 +868,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_hunter_toc5AI(pCreature); + return new boss_hunter_toc5AI(creature); } }; @@ -882,9 +882,9 @@ public: // Lana Stouthammer Evensong && Deathstalker Visceri || Rouge struct boss_rouge_toc5AI : public ScriptedAI { - boss_rouge_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + boss_rouge_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -989,9 +989,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_rouge_toc5AI(pCreature); + return new boss_rouge_toc5AI(creature); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 44dd6efe712..212e22506d3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -48,9 +48,9 @@ public: struct npc_announcer_toc5AI : public ScriptedAI { - npc_announcer_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + npc_announcer_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); uiSummonTimes = 0; uiPosition = 0; @@ -461,14 +461,14 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_announcer_toc5AI(pCreature); + return new npc_announcer_toc5AI(creature); } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - InstanceScript* pInstance = pCreature->GetInstanceScript(); + InstanceScript* pInstance = creature->GetInstanceScript(); if (pInstance && ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && @@ -486,18 +486,18 @@ public: else if (pInstance) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_announcer_toc5::npc_announcer_toc5AI, pCreature->AI())->StartEncounter(); + CAST_AI(npc_announcer_toc5::npc_announcer_toc5AI, creature->AI())->StartEncounter(); } return true; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 76150269b4e..0be23eb484c 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -127,16 +127,16 @@ class boss_anubarak_trial : public CreatureScript public: boss_anubarak_trial() : CreatureScript("boss_anubarak_trial") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_anubarak_trialAI(pCreature); + return new boss_anubarak_trialAI(creature); }; struct boss_anubarak_trialAI : public ScriptedAI { - boss_anubarak_trialAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_anubarak_trialAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -412,16 +412,16 @@ class mob_swarm_scarab : public CreatureScript public: mob_swarm_scarab() : CreatureScript("mob_swarm_scarab") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_swarm_scarabAI(pCreature); + return new mob_swarm_scarabAI(creature); }; struct mob_swarm_scarabAI : public ScriptedAI { - mob_swarm_scarabAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_swarm_scarabAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -479,16 +479,16 @@ class mob_nerubian_burrower : public CreatureScript public: mob_nerubian_burrower() : CreatureScript("mob_nerubian_burrower") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_nerubian_burrowerAI(pCreature); + return new mob_nerubian_burrowerAI(creature); }; struct mob_nerubian_burrowerAI : public ScriptedAI { - mob_nerubian_burrowerAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_nerubian_burrowerAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -556,14 +556,14 @@ class mob_frost_sphere : public CreatureScript public: mob_frost_sphere() : CreatureScript("mob_frost_sphere") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_frost_sphereAI(pCreature); + return new mob_frost_sphereAI(creature); }; struct mob_frost_sphereAI : public ScriptedAI { - mob_frost_sphereAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_frost_sphereAI(Creature* creature) : ScriptedAI(creature) { } @@ -636,16 +636,16 @@ class mob_anubarak_spike : public CreatureScript public: mob_anubarak_spike() : CreatureScript("mob_anubarak_spike") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_anubarak_spikeAI(pCreature); + return new mob_anubarak_spikeAI(creature); }; struct mob_anubarak_spikeAI : public ScriptedAI { - mob_anubarak_spikeAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_anubarak_spikeAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index e7b633b6dba..667dc70b664 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -55,16 +55,16 @@ class boss_toc_champion_controller : public CreatureScript public: boss_toc_champion_controller() : CreatureScript("boss_toc_champion_controller") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_toc_champion_controllerAI (pCreature); + return new boss_toc_champion_controllerAI (creature); } struct boss_toc_champion_controllerAI : public ScriptedAI { - boss_toc_champion_controllerAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_toc_champion_controllerAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript *) pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript *) creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -251,9 +251,9 @@ public: struct boss_faction_championsAI : public ScriptedAI { - boss_faction_championsAI(Creature* pCreature, uint32 aitype) : ScriptedAI(pCreature) + boss_faction_championsAI(Creature* creature, uint32 aitype) : ScriptedAI(creature) { - m_pInstance = (InstanceScript *) pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript *) creature->GetInstanceScript(); mAIType = aitype; } @@ -468,14 +468,14 @@ class mob_toc_druid : public CreatureScript public: mob_toc_druid() : CreatureScript("mob_toc_druid") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_druidAI (pCreature); + return new mob_toc_druidAI (creature); } struct mob_toc_druidAI : public boss_faction_championsAI { - mob_toc_druidAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_druidAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} uint32 m_uiNatureGraspTimer; uint32 m_uiTranquilityTimer; @@ -564,14 +564,14 @@ class mob_toc_shaman : public CreatureScript public: mob_toc_shaman() : CreatureScript("mob_toc_shaman") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_shamanAI (pCreature); + return new mob_toc_shamanAI (creature); } struct mob_toc_shamanAI : public boss_faction_championsAI { - mob_toc_shamanAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} uint32 m_uiHeroismOrBloodlustTimer; uint32 m_uiHexTimer; @@ -657,14 +657,14 @@ class mob_toc_paladin : public CreatureScript public: mob_toc_paladin() : CreatureScript("mob_toc_paladin") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_paladinAI (pCreature); + return new mob_toc_paladinAI (creature); } struct mob_toc_paladinAI : public boss_faction_championsAI { - mob_toc_paladinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} uint32 m_uiBubbleTimer; uint32 m_uiHandOfProtectionTimer; @@ -764,14 +764,14 @@ class mob_toc_priest : public CreatureScript public: mob_toc_priest() : CreatureScript("mob_toc_priest") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_priestAI (pCreature); + return new mob_toc_priestAI (creature); } struct mob_toc_priestAI : public boss_faction_championsAI { - mob_toc_priestAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} uint32 m_uiPsychicScreamTimer; uint32 m_uiCommonTimer; @@ -845,14 +845,14 @@ class mob_toc_shadow_priest : public CreatureScript public: mob_toc_shadow_priest() : CreatureScript("mob_toc_shadow_priest") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_shadow_priestAI (pCreature); + return new mob_toc_shadow_priestAI (creature); } struct mob_toc_shadow_priestAI : public boss_faction_championsAI { - mob_toc_shadow_priestAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_shadow_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} uint32 m_uiPsychicScreamTimer; uint32 m_uiDispersionTimer; @@ -958,14 +958,14 @@ class mob_toc_warlock : public CreatureScript public: mob_toc_warlock() : CreatureScript("mob_toc_warlock") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_warlockAI (pCreature); + return new mob_toc_warlockAI (creature); } struct mob_toc_warlockAI : public boss_faction_championsAI { - mob_toc_warlockAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} + mob_toc_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED), Summons(me) {} SummonList Summons; @@ -1065,14 +1065,14 @@ class mob_toc_mage : public CreatureScript public: mob_toc_mage() : CreatureScript("mob_toc_mage") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_mageAI (pCreature); + return new mob_toc_mageAI (creature); } struct mob_toc_mageAI : public boss_faction_championsAI { - mob_toc_mageAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_mageAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} uint32 m_uiCounterspellTimer; uint32 m_uiBlinkTimer; @@ -1168,14 +1168,14 @@ class mob_toc_hunter : public CreatureScript public: mob_toc_hunter() : CreatureScript("mob_toc_hunter") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_hunterAI (pCreature); + return new mob_toc_hunterAI (creature); } struct mob_toc_hunterAI : public boss_faction_championsAI { - mob_toc_hunterAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} + mob_toc_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED), Summons(me) {} SummonList Summons; @@ -1284,14 +1284,14 @@ class mob_toc_boomkin : public CreatureScript public: mob_toc_boomkin() : CreatureScript("mob_toc_boomkin") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_boomkinAI (pCreature); + return new mob_toc_boomkinAI (creature); } struct mob_toc_boomkinAI : public boss_faction_championsAI { - mob_toc_boomkinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_boomkinAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} uint32 m_uiBarkskinTimer; uint32 m_uiCycloneTimer; @@ -1388,14 +1388,14 @@ class mob_toc_warrior : public CreatureScript public: mob_toc_warrior() : CreatureScript("mob_toc_warrior") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_warriorAI (pCreature); + return new mob_toc_warriorAI (creature); } struct mob_toc_warriorAI : public boss_faction_championsAI { - mob_toc_warriorAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_warriorAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} uint32 m_uiBladestormTimer; uint32 m_uiIntimidatingShoutTimer; @@ -1502,14 +1502,14 @@ class mob_toc_dk : public CreatureScript public: mob_toc_dk() : CreatureScript("mob_toc_dk") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_dkAI (pCreature); + return new mob_toc_dkAI (creature); } struct mob_toc_dkAI : public boss_faction_championsAI { - mob_toc_dkAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_dkAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} uint32 m_uiIceboundFortitudeTimer; uint32 m_uiChainsOfIceTimer; @@ -1604,14 +1604,14 @@ class mob_toc_rogue : public CreatureScript public: mob_toc_rogue() : CreatureScript("mob_toc_rogue") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_rogueAI (pCreature); + return new mob_toc_rogueAI (creature); } struct mob_toc_rogueAI : public boss_faction_championsAI { - mob_toc_rogueAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_rogueAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} uint32 m_uiFanOfKnivesTimer; uint32 m_uiHemorrhageTimer; @@ -1703,14 +1703,14 @@ class mob_toc_enh_shaman : public CreatureScript public: mob_toc_enh_shaman() : CreatureScript("mob_toc_enh_shaman") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_enh_shamanAI (pCreature); + return new mob_toc_enh_shamanAI (creature); } struct mob_toc_enh_shamanAI : public boss_faction_championsAI { - mob_toc_enh_shamanAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE), Summons(me) {} + mob_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE), Summons(me) {} SummonList Summons; @@ -1837,14 +1837,14 @@ class mob_toc_retro_paladin : public CreatureScript public: mob_toc_retro_paladin() : CreatureScript("mob_toc_retro_paladin") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_retro_paladinAI (pCreature); + return new mob_toc_retro_paladinAI (creature); } struct mob_toc_retro_paladinAI : public boss_faction_championsAI { - mob_toc_retro_paladinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_retro_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} uint32 m_uiRepeteanceTimer; uint32 m_uiCrusaderStrikeTimer; @@ -1930,14 +1930,14 @@ class mob_toc_pet_warlock : public CreatureScript public: mob_toc_pet_warlock() : CreatureScript("mob_toc_pet_warlock") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_pet_warlockAI (pCreature); + return new mob_toc_pet_warlockAI (creature); } struct mob_toc_pet_warlockAI : public boss_faction_championsAI { - mob_toc_pet_warlockAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} + mob_toc_pet_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {} uint32 m_uiDevourMagicTimer; uint32 m_uiSpellLockTimer; @@ -1981,14 +1981,14 @@ class mob_toc_pet_hunter : public CreatureScript public: mob_toc_pet_hunter() : CreatureScript("mob_toc_pet_hunter") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_toc_pet_hunterAI (pCreature); + return new mob_toc_pet_hunterAI (creature); } struct mob_toc_pet_hunterAI : public boss_faction_championsAI { - mob_toc_pet_hunterAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} + mob_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {} uint32 m_uiClawTimer; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 6cdca10dde0..24dbb7fb68c 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -90,16 +90,16 @@ class boss_jaraxxus : public CreatureScript public: boss_jaraxxus() : CreatureScript("boss_jaraxxus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_jaraxxusAI(pCreature); + return new boss_jaraxxusAI(creature); } struct boss_jaraxxusAI : public ScriptedAI { - boss_jaraxxusAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_jaraxxusAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); Reset(); } @@ -252,14 +252,14 @@ class mob_legion_flame : public CreatureScript public: mob_legion_flame() : CreatureScript("mob_legion_flame") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_legion_flameAI(pCreature); + return new mob_legion_flameAI(creature); } struct mob_legion_flameAI : public Scripted_NoMovementAI { - mob_legion_flameAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) + mob_legion_flameAI(Creature* creature) : Scripted_NoMovementAI(creature) { Reset(); } @@ -284,16 +284,16 @@ class mob_infernal_volcano : public CreatureScript public: mob_infernal_volcano() : CreatureScript("mob_infernal_volcano") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_infernal_volcanoAI(pCreature); + return new mob_infernal_volcanoAI(creature); } struct mob_infernal_volcanoAI : public Scripted_NoMovementAI { - mob_infernal_volcanoAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature), Summons(me) + mob_infernal_volcanoAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); Reset(); } @@ -360,16 +360,16 @@ class mob_fel_infernal : public CreatureScript public: mob_fel_infernal() : CreatureScript("mob_fel_infernal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_fel_infernalAI(pCreature); + return new mob_fel_infernalAI(creature); } struct mob_fel_infernalAI : public ScriptedAI { - mob_fel_infernalAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_fel_infernalAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); Reset(); } @@ -414,16 +414,16 @@ class mob_nether_portal : public CreatureScript public: mob_nether_portal() : CreatureScript("mob_nether_portal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_nether_portalAI(pCreature); + return new mob_nether_portalAI(creature); } struct mob_nether_portalAI : public ScriptedAI { - mob_nether_portalAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + mob_nether_portalAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); Reset(); } @@ -484,16 +484,16 @@ class mob_mistress_of_pain : public CreatureScript public: mob_mistress_of_pain() : CreatureScript("mob_mistress_of_pain") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_mistress_of_painAI(pCreature); + return new mob_mistress_of_painAI(creature); } struct mob_mistress_of_painAI : public ScriptedAI { - mob_mistress_of_painAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_mistress_of_painAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); if (m_pInstance) m_pInstance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, INCREASE); Reset(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 0ff10a55ec9..7a62723753e 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -114,16 +114,16 @@ class boss_gormok : public CreatureScript public: boss_gormok() : CreatureScript("boss_gormok") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_gormokAI(pCreature); + return new boss_gormokAI(creature); } struct boss_gormokAI : public ScriptedAI { - boss_gormokAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_gormokAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -229,16 +229,16 @@ class mob_snobold_vassal : public CreatureScript public: mob_snobold_vassal() : CreatureScript("mob_snobold_vassal") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_snobold_vassalAI(pCreature); + return new mob_snobold_vassalAI(creature); } struct mob_snobold_vassalAI : public ScriptedAI { - mob_snobold_vassalAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_snobold_vassalAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); if (m_pInstance) m_pInstance->SetData(DATA_SNOBOLD_COUNT, INCREASE); } @@ -576,7 +576,7 @@ class boss_acidmaw : public CreatureScript struct boss_acidmawAI : public boss_jormungarAI { - boss_acidmawAI(Creature* pCreature) : boss_jormungarAI(pCreature) { } + boss_acidmawAI(Creature* creature) : boss_jormungarAI(creature) { } void Reset() { @@ -608,7 +608,7 @@ public: struct boss_dreadscaleAI : public boss_jormungarAI { - boss_dreadscaleAI(Creature* pCreature) : boss_jormungarAI(pCreature) { } + boss_dreadscaleAI(Creature* creature) : boss_jormungarAI(creature) { } void Reset() { @@ -626,9 +626,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_dreadscaleAI(pCreature); + return new boss_dreadscaleAI(creature); } }; @@ -637,14 +637,14 @@ class mob_slime_pool : public CreatureScript public: mob_slime_pool() : CreatureScript("mob_slime_pool") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_slime_poolAI(pCreature); + return new mob_slime_poolAI(creature); } struct mob_slime_poolAI : public ScriptedAI { - mob_slime_poolAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_slime_poolAI(Creature* creature) : ScriptedAI(creature) { } @@ -672,16 +672,16 @@ class boss_icehowl : public CreatureScript public: boss_icehowl() : CreatureScript("boss_icehowl") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_icehowlAI(pCreature); + return new boss_icehowlAI(creature); } struct boss_icehowlAI : public ScriptedAI { - boss_icehowlAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_icehowlAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 8092715d574..5ea54803327 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -114,9 +114,9 @@ enum Actions struct boss_twin_baseAI : public ScriptedAI { - boss_twin_baseAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_twin_baseAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -436,14 +436,14 @@ class boss_fjola : public CreatureScript public: boss_fjola() : CreatureScript("boss_fjola") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_fjolaAI(pCreature); + return new boss_fjolaAI(creature); } struct boss_fjolaAI : public boss_twin_baseAI { - boss_fjolaAI(Creature* pCreature) : boss_twin_baseAI(pCreature) {} + boss_fjolaAI(Creature* creature) : boss_twin_baseAI(creature) {} void Reset() { boss_twin_baseAI::Reset(); @@ -495,14 +495,14 @@ class boss_eydis : public CreatureScript public: boss_eydis() : CreatureScript("boss_eydis") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_eydisAI(pCreature); + return new boss_eydisAI(creature); } struct boss_eydisAI : public boss_twin_baseAI { - boss_eydisAI(Creature* pCreature) : boss_twin_baseAI(pCreature) {} + boss_eydisAI(Creature* creature) : boss_twin_baseAI(creature) {} void Reset() { boss_twin_baseAI::Reset(); @@ -578,9 +578,9 @@ class mob_essence_of_twin : public CreatureScript struct mob_unleashed_ballAI : public ScriptedAI { - mob_unleashed_ballAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_unleashed_ballAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -630,14 +630,14 @@ class mob_unleashed_dark : public CreatureScript public: mob_unleashed_dark() : CreatureScript("mob_unleashed_dark") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_unleashed_darkAI(pCreature); + return new mob_unleashed_darkAI(creature); } struct mob_unleashed_darkAI : public mob_unleashed_ballAI { - mob_unleashed_darkAI(Creature* pCreature) : mob_unleashed_ballAI(pCreature) {} + mob_unleashed_darkAI(Creature* creature) : mob_unleashed_ballAI(creature) {} void UpdateAI(const uint32 uiDiff) { @@ -663,14 +663,14 @@ class mob_unleashed_light : public CreatureScript public: mob_unleashed_light() : CreatureScript("mob_unleashed_light") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_unleashed_lightAI(pCreature); + return new mob_unleashed_lightAI(creature); } struct mob_unleashed_lightAI : public mob_unleashed_ballAI { - mob_unleashed_lightAI(Creature* pCreature) : mob_unleashed_ballAI(pCreature) {} + mob_unleashed_lightAI(Creature* creature) : mob_unleashed_ballAI(creature) {} void UpdateAI(const uint32 uiDiff) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index a53f9c340ed..3ce934201d8 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -104,9 +104,9 @@ class npc_announcer_toc10 : public CreatureScript struct npc_announcer_toc10AI : public ScriptedAI { - npc_announcer_toc10AI(Creature* pCreature) : ScriptedAI(pCreature) + npc_announcer_toc10AI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -237,9 +237,9 @@ class boss_lich_king_toc : public CreatureScript struct boss_lich_king_tocAI : public ScriptedAI { - boss_lich_king_tocAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_lich_king_tocAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); + m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -339,9 +339,9 @@ class boss_lich_king_toc : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lich_king_tocAI(pCreature); + return new boss_lich_king_tocAI(creature); } }; @@ -353,7 +353,7 @@ class npc_fizzlebang_toc : public CreatureScript struct npc_fizzlebang_tocAI : public ScriptedAI { - npc_fizzlebang_tocAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + npc_fizzlebang_tocAI(Creature* creature) : ScriptedAI(creature), Summons(me) { m_pInstance = (InstanceScript*)me->GetInstanceScript(); } @@ -506,9 +506,9 @@ class npc_fizzlebang_toc : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_fizzlebang_tocAI(pCreature); + return new npc_fizzlebang_tocAI(creature); } }; @@ -520,7 +520,7 @@ class npc_tirion_toc : public CreatureScript struct npc_tirion_tocAI : public ScriptedAI { - npc_tirion_tocAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_tirion_tocAI(Creature* creature) : ScriptedAI(creature) { m_pInstance = (InstanceScript*)me->GetInstanceScript(); } @@ -820,9 +820,9 @@ class npc_tirion_toc : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_tirion_tocAI(pCreature); + return new npc_tirion_tocAI(creature); } }; @@ -834,7 +834,7 @@ class npc_garrosh_toc : public CreatureScript struct npc_garrosh_tocAI : public ScriptedAI { - npc_garrosh_tocAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_garrosh_tocAI(Creature* creature) : ScriptedAI(creature) { m_pInstance = (InstanceScript*)me->GetInstanceScript(); } @@ -898,9 +898,9 @@ class npc_garrosh_toc : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_garrosh_tocAI(pCreature); + return new npc_garrosh_tocAI(creature); } }; @@ -912,7 +912,7 @@ class npc_varian_toc : public CreatureScript struct npc_varian_tocAI : public ScriptedAI { - npc_varian_tocAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_varian_tocAI(Creature* creature) : ScriptedAI(creature) { m_pInstance = (InstanceScript*)me->GetInstanceScript(); } @@ -976,9 +976,9 @@ class npc_varian_toc : public CreatureScript } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_varian_tocAI(pCreature); + return new npc_varian_tocAI(creature); } }; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 3622de4cb66..8c12b1956c3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -50,14 +50,14 @@ class boss_falric : public CreatureScript public: boss_falric() : CreatureScript("boss_falric") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_falricAI(pCreature); + return new boss_falricAI(creature); } struct boss_falricAI : public boss_horAI { - boss_falricAI(Creature* pCreature) : boss_horAI(pCreature) {} + boss_falricAI(Creature* creature) : boss_horAI(creature) {} uint8 uiHopelessnessCount; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index a4c4dc36e96..a0557e6e430 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -50,14 +50,14 @@ class boss_marwyn : public CreatureScript public: boss_marwyn() : CreatureScript("boss_marwyn") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_marwynAI(pCreature); + return new boss_marwynAI(creature); } struct boss_marwynAI : public boss_horAI { - boss_marwynAI(Creature* pCreature) : boss_horAI(pCreature) {} + boss_marwynAI(Creature* creature) : boss_horAI(creature) {} void Reset() { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index adeb289ad3b..aa7022de2cf 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -157,32 +157,32 @@ private: public: npc_jaina_or_sylvanas_hor(bool isSylvana, const char* name) : CreatureScript(name), m_isSylvana(isSylvana) { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); - if (pCreature->AI()) - pCreature->AI()->DoAction(ACTION_START_INTRO); - pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + if (creature->AI()) + creature->AI()->DoAction(ACTION_START_INTRO); + creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); - if (pCreature->AI()) - pCreature->AI()->DoAction(ACTION_SKIP_INTRO); - pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + if (creature->AI()) + creature->AI()->DoAction(ACTION_SKIP_INTRO); + creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); 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()); QuestStatus status = pPlayer->GetQuestStatus(m_isSylvana ? QUEST_DELIVRANCE_FROM_THE_PIT_H2 : QUEST_DELIVRANCE_FROM_THE_PIT_A2); if (status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) @@ -193,19 +193,19 @@ public: if (status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) pPlayer->ADD_GOSSIP_ITEM( 0, "Dark Lady, I think I hear Arthas coming. Whatever you're going to do, do it quickly.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_jaina_or_sylvanas_horAI(pCreature); + return new npc_jaina_or_sylvanas_horAI(creature); } // AI of Part1: handle the intro till start of gauntlet event. struct npc_jaina_or_sylvanas_horAI : public ScriptedAI { - npc_jaina_or_sylvanas_horAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_jaina_or_sylvanas_horAI(Creature* creature) : ScriptedAI(creature) { pInstance = me->GetInstanceScript(); } @@ -626,9 +626,9 @@ class npc_ghostly_priest : public CreatureScript public: npc_ghostly_priest() : CreatureScript("npc_ghostly_priest") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_ghostly_priestAI(pCreature); + return new npc_ghostly_priestAI(creature); } struct npc_ghostly_priestAI: public ScriptedAI @@ -708,9 +708,9 @@ class npc_phantom_mage : public CreatureScript public: npc_phantom_mage() : CreatureScript("npc_phantom_mage") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_phantom_mageAI(pCreature); + return new npc_phantom_mageAI(creature); } struct npc_phantom_mageAI: public ScriptedAI @@ -785,9 +785,9 @@ class npc_phantom_hallucination : public CreatureScript public: npc_phantom_hallucination() : CreatureScript("npc_phantom_hallucination") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_phantom_hallucinationAI(pCreature); + return new npc_phantom_hallucinationAI(creature); } struct npc_phantom_hallucinationAI : public npc_phantom_mage::npc_phantom_mageAI @@ -809,9 +809,9 @@ class npc_shadowy_mercenary : public CreatureScript public: npc_shadowy_mercenary() : CreatureScript("npc_shadowy_mercenary") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_shadowy_mercenaryAI(pCreature); + return new npc_shadowy_mercenaryAI(creature); } struct npc_shadowy_mercenaryAI: public ScriptedAI @@ -880,9 +880,9 @@ class npc_spectral_footman : public CreatureScript public: npc_spectral_footman() : CreatureScript("npc_spectral_footman") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_spectral_footmanAI(pCreature); + return new npc_spectral_footmanAI(creature); } struct npc_spectral_footmanAI: public ScriptedAI @@ -945,9 +945,9 @@ class npc_tortured_rifleman : public CreatureScript public: npc_tortured_rifleman() : CreatureScript("npc_tortured_rifleman") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_tortured_riflemanAI(pCreature); + return new npc_tortured_riflemanAI(creature); } struct npc_tortured_riflemanAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index c433ec28cfe..0879ceca9ec 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -79,7 +79,7 @@ enum Actions // handled the summonList and the notification events to/from the InstanceScript struct boss_horAI : ScriptedAI { - boss_horAI(Creature* pCreature) : ScriptedAI(pCreature), summons(pCreature) + boss_horAI(Creature* creature) : ScriptedAI(creature), summons(creature) { pInstance = me->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index a906fe03d12..79c5e9a8144 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -387,9 +387,9 @@ class npc_living_mojo : public CreatureScript public: npc_living_mojo() : CreatureScript("npc_living_mojo") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_living_mojoAI (pCreature); + return new npc_living_mojoAI (creature); } struct npc_living_mojoAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index b4f5b9f8865..776640a86fb 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -34,9 +34,9 @@ class boss_eck : public CreatureScript public: boss_eck() : CreatureScript("boss_eck") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_eckAI (pCreature); + return new boss_eckAI (creature); } struct boss_eckAI : public ScriptedAI @@ -138,9 +138,9 @@ class npc_ruins_dweller : public CreatureScript public: npc_ruins_dweller() : CreatureScript("npc_ruins_dweller") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_ruins_dwellerAI (pCreature); + return new npc_ruins_dwellerAI (creature); } struct npc_ruins_dwellerAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index b20be83b52e..8cbb1ec8d0e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -68,9 +68,9 @@ class boss_gal_darah : public CreatureScript public: boss_gal_darah() : CreatureScript("boss_gal_darah") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_gal_darahAI (pCreature); + return new boss_gal_darahAI (creature); } struct boss_gal_darahAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index eba80c176d3..270829b1bee 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -50,16 +50,16 @@ class boss_moorabi : public CreatureScript public: boss_moorabi() : CreatureScript("boss_moorabi") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_moorabiAI(pCreature); + return new boss_moorabiAI(creature); } struct boss_moorabiAI : public ScriptedAI { - boss_moorabiAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_moorabiAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 25e13b79dd9..94b5fda5894 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -70,9 +70,9 @@ class boss_slad_ran : public CreatureScript public: boss_slad_ran() : CreatureScript("boss_slad_ran") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_slad_ranAI (pCreature); + return new boss_slad_ranAI (creature); } struct boss_slad_ranAI : public ScriptedAI @@ -195,9 +195,9 @@ class mob_slad_ran_constrictor : public CreatureScript public: mob_slad_ran_constrictor() : CreatureScript("mob_slad_ran_constrictor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_slad_ran_constrictorAI (pCreature); + return new mob_slad_ran_constrictorAI (creature); } struct mob_slad_ran_constrictorAI : public ScriptedAI @@ -232,9 +232,9 @@ class mob_slad_ran_viper : public CreatureScript public: mob_slad_ran_viper() : CreatureScript("mob_slad_ran_viper") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_slad_ran_viperAI (pCreature); + return new mob_slad_ran_viperAI (creature); } struct mob_slad_ran_viperAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 488bd83fb26..622add70b17 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -56,9 +56,9 @@ class boss_anubrekhan : public CreatureScript public: boss_anubrekhan() : CreatureScript("boss_anubrekhan") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_anubrekhanAI (pCreature); + return new boss_anubrekhanAI (creature); } struct boss_anubrekhanAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index a86f77c14fc..85068c968d9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -188,8 +188,8 @@ class mob_faerlina_add : public CreatureScript struct mob_faerlina_addAI : public ScriptedAI { - mob_faerlina_addAI(Creature* pCreature) : ScriptedAI(pCreature), - _instance(pCreature->GetInstanceScript()) + mob_faerlina_addAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) { } @@ -212,9 +212,9 @@ class mob_faerlina_add : public CreatureScript InstanceScript* const _instance; }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_faerlina_addAI(pCreature); + return new mob_faerlina_addAI(creature); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 99b4aba247f..b6c0f523f3b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -82,9 +82,9 @@ class boss_four_horsemen : public CreatureScript public: boss_four_horsemen() : CreatureScript("boss_four_horsemen") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_four_horsemenAI (pCreature); + return new boss_four_horsemenAI (creature); } struct boss_four_horsemenAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index cf08338024b..e340e1d213b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -50,9 +50,9 @@ class boss_gluth : public CreatureScript public: boss_gluth() : CreatureScript("boss_gluth") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_gluthAI (pCreature); + return new boss_gluthAI (creature); } struct boss_gluthAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 8b1f52dfb31..4b59ac3fa7c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -38,9 +38,9 @@ class boss_grobbulus : public CreatureScript public: boss_grobbulus() : CreatureScript("boss_grobbulus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_grobbulusAI (pCreature); + return new boss_grobbulusAI (creature); } struct boss_grobbulusAI : public BossAI @@ -110,14 +110,14 @@ class npc_grobbulus_poison_cloud : public CreatureScript public: npc_grobbulus_poison_cloud() : CreatureScript("npc_grobbulus_poison_cloud") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_grobbulus_poison_cloudAI(pCreature); + return new npc_grobbulus_poison_cloudAI(creature); } struct npc_grobbulus_poison_cloudAI : public Scripted_NoMovementAI { - npc_grobbulus_poison_cloudAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) + npc_grobbulus_poison_cloudAI(Creature* creature) : Scripted_NoMovementAI(creature) { Reset(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 6498e1d5556..4da9e661087 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -50,9 +50,9 @@ class boss_heigan : public CreatureScript public: boss_heigan() : CreatureScript("boss_heigan") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_heiganAI (pCreature); + return new boss_heiganAI (creature); } struct boss_heiganAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 31ef9460297..5531b14416c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -638,9 +638,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kelthuzadAI (pCreature); + return new boss_kelthuzadAI (creature); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 8ee21526b7d..8159765d9e9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -41,9 +41,9 @@ class boss_loatheb : public CreatureScript public: boss_loatheb() : CreatureScript("boss_loatheb") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_loathebAI (pCreature); + return new boss_loathebAI (creature); } struct boss_loathebAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index c6a8e45c472..fa978f323b6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -61,9 +61,9 @@ class boss_maexxna : public CreatureScript public: boss_maexxna() : CreatureScript("boss_maexxna") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_maexxnaAI (pCreature); + return new boss_maexxnaAI (creature); } struct boss_maexxnaAI : public BossAI @@ -152,9 +152,9 @@ class mob_webwrap : public CreatureScript public: mob_webwrap() : CreatureScript("mob_webwrap") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_webwrapAI (pCreature); + return new mob_webwrapAI (creature); } struct mob_webwrapAI : public NullCreatureAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 740c477c69a..ca85034d36f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -68,9 +68,9 @@ class boss_noth : public CreatureScript public: boss_noth() : CreatureScript("boss_noth") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_nothAI (pCreature); + return new boss_nothAI (creature); } struct boss_nothAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index fadc4171ed9..d0d8fa11ae8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -55,9 +55,9 @@ class boss_patchwerk : public CreatureScript public: boss_patchwerk() : CreatureScript("boss_patchwerk") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_patchwerkAI (pCreature); + return new boss_patchwerkAI (creature); } struct boss_patchwerkAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index c934334604d..afe0b9929e9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -57,9 +57,9 @@ class boss_razuvious : public CreatureScript public: boss_razuvious() : CreatureScript("boss_razuvious") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_razuviousAI (pCreature); + return new boss_razuviousAI (creature); } struct boss_razuviousAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 825bd74c1e0..d548c30bc5d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -74,9 +74,9 @@ class boss_sapphiron : public CreatureScript public: boss_sapphiron() : CreatureScript("boss_sapphiron") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_sapphironAI (pCreature); + return new boss_sapphironAI (creature); } struct boss_sapphironAI : public BossAI diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 23de7c4afa4..8397d41fd43 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -99,9 +99,9 @@ class boss_thaddius : public CreatureScript public: boss_thaddius() : CreatureScript("boss_thaddius") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_thaddiusAI (pCreature); + return new boss_thaddiusAI (creature); } struct boss_thaddiusAI : public BossAI @@ -259,9 +259,9 @@ class mob_stalagg : public CreatureScript public: mob_stalagg() : CreatureScript("mob_stalagg") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_stalaggAI(pCreature); + return new mob_stalaggAI(creature); } struct mob_stalaggAI : public ScriptedAI @@ -345,9 +345,9 @@ class mob_feugen : public CreatureScript public: mob_feugen() : CreatureScript("mob_feugen") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_feugenAI(pCreature); + return new mob_feugenAI(creature); } struct mob_feugenAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index f65fab3310e..88ccae482e3 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -724,9 +724,9 @@ class npc_portal_eoe: public CreatureScript public: npc_portal_eoe() : CreatureScript("npc_portal_eoe") {} - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_portal_eoeAI(pCreature); + return new npc_portal_eoeAI(creature); } struct npc_portal_eoeAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index adb8e1d1376..439ef7c83d2 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -54,9 +54,9 @@ class boss_keristrasza : public CreatureScript public: boss_keristrasza() : CreatureScript("boss_keristrasza") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_keristraszaAI (pCreature); + return new boss_keristraszaAI (creature); } struct boss_keristraszaAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index db83efd695e..72ade0857a8 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -60,9 +60,9 @@ class boss_magus_telestra : public CreatureScript public: boss_magus_telestra() : CreatureScript("boss_magus_telestra") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_magus_telestraAI (pCreature); + return new boss_magus_telestraAI (creature); } struct boss_magus_telestraAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index ef9ccb39a36..aa8fc95ead3 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -54,9 +54,9 @@ class boss_ormorok : public CreatureScript public: boss_ormorok() : CreatureScript("boss_ormorok") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ormorokAI (pCreature); + return new boss_ormorokAI (creature); } struct boss_ormorokAI : public ScriptedAI @@ -227,9 +227,9 @@ class mob_crystal_spike : public CreatureScript public: mob_crystal_spike() : CreatureScript("mob_crystal_spike") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_crystal_spikeAI (pCreature); + return new mob_crystal_spikeAI (creature); } struct mob_crystal_spikeAI : public Scripted_NoMovementAI @@ -270,9 +270,9 @@ class mob_crystalline_tangler : public CreatureScript public: mob_crystalline_tangler() : CreatureScript("mob_crystalline_tangler") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_crystalline_tanglerAI (pCreature); + return new mob_crystalline_tanglerAI (creature); } struct mob_crystalline_tanglerAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp index 0a82eb4d778..0d537955ec5 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp @@ -42,9 +42,9 @@ class boss_commander_kolurg : public CreatureScript public: boss_commander_kolurg() : CreatureScript("boss_commander_kolurg") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_commander_kolurgAI (pCreature); + return new boss_commander_kolurgAI (creature); } struct boss_commander_kolurgAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp index 365db104337..1804c75987f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp @@ -42,9 +42,9 @@ class boss_commander_stoutbeard : public CreatureScript public: boss_commander_stoutbeard() : CreatureScript("boss_commander_stoutbeard") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_commander_stoutbeardAI (pCreature); + return new boss_commander_stoutbeardAI (creature); } struct boss_commander_stoutbeardAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 58203f95a40..e90ca9052f4 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -156,9 +156,9 @@ class npc_unstable_sphere : public CreatureScript public: npc_unstable_sphere() : CreatureScript("npc_unstable_sphere") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_unstable_sphereAI (pCreature); + return new npc_unstable_sphereAI (creature); } struct npc_unstable_sphereAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 3bd8531aa9f..da8a6552ed3 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -115,9 +115,9 @@ class boss_eregos : public CreatureScript public: boss_eregos() : CreatureScript("boss_eregos") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_eregosAI (pCreature); + return new boss_eregosAI (creature); } struct boss_eregosAI : public BossAI diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 07188b1a08b..2416078119c 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -91,9 +91,9 @@ class boss_urom : public CreatureScript public: boss_urom() : CreatureScript("boss_urom") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_uromAI (pCreature); + return new boss_uromAI (creature); } struct boss_uromAI : public BossAI diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index d6c2942d16a..5b5eeaeac7e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -55,10 +55,10 @@ class npc_oculus_drake : public CreatureScript public: npc_oculus_drake() : CreatureScript("npc_oculus_drake") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case NPC_VERDISA: //Verdisa switch(uiAction) @@ -68,12 +68,12 @@ public: { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA1, creature->GetGUID()); } else { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA2, creature->GetGUID()); } break; case GOSSIP_ACTION_INFO_DEF + 2: @@ -86,7 +86,7 @@ public: break; } case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA3, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA3, creature->GetGUID()); break; } break; @@ -98,12 +98,12 @@ public: { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ1, creature->GetGUID()); } else { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ2, creature->GetGUID()); } break; case GOSSIP_ACTION_INFO_DEF + 2: @@ -116,7 +116,7 @@ public: break; } case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ3, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ3, creature->GetGUID()); break; } break; @@ -128,12 +128,12 @@ public: { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS1, creature->GetGUID()); } else { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS2, creature->GetGUID()); } break; case GOSSIP_ACTION_INFO_DEF + 2: @@ -146,7 +146,7 @@ public: break; } case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS3, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS3, creature->GetGUID()); break; } break; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 36aef9c7100..a36581d9136 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -86,16 +86,16 @@ class boss_bjarngrim : public CreatureScript public: boss_bjarngrim() : CreatureScript("boss_bjarngrim") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_bjarngrimAI(pCreature); + return new boss_bjarngrimAI(creature); } struct boss_bjarngrimAI : public ScriptedAI { - boss_bjarngrimAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_bjarngrimAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); m_uiStance = STANCE_DEFENSIVE; memset(&m_auiStormforgedLieutenantGUID, 0, sizeof(m_auiStormforgedLieutenantGUID)); } @@ -362,16 +362,16 @@ class mob_stormforged_lieutenant : public CreatureScript public: mob_stormforged_lieutenant() : CreatureScript("mob_stormforged_lieutenant") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_stormforged_lieutenantAI(pCreature); + return new mob_stormforged_lieutenantAI(creature); } struct mob_stormforged_lieutenantAI : public ScriptedAI { - mob_stormforged_lieutenantAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_stormforged_lieutenantAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index d10d9946e24..0224571cd68 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -71,16 +71,16 @@ class boss_ionar : public CreatureScript public: boss_ionar() : CreatureScript("boss_ionar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ionarAI(pCreature); + return new boss_ionarAI(creature); } struct boss_ionarAI : public ScriptedAI { - boss_ionarAI(Creature* pCreature) : ScriptedAI(pCreature), lSparkList(pCreature) + boss_ionarAI(Creature* creature) : ScriptedAI(creature), lSparkList(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -301,16 +301,16 @@ class mob_spark_of_ionar : public CreatureScript public: mob_spark_of_ionar() : CreatureScript("mob_spark_of_ionar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_spark_of_ionarAI(pCreature); + return new mob_spark_of_ionarAI(creature); } struct mob_spark_of_ionarAI : public ScriptedAI { - mob_spark_of_ionarAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_spark_of_ionarAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 011c4c589b5..21493c8eccc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -63,16 +63,16 @@ class boss_loken : public CreatureScript public: boss_loken() : CreatureScript("boss_loken") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lokenAI(pCreature); + return new boss_lokenAI(creature); } struct boss_lokenAI : public ScriptedAI { - boss_lokenAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_lokenAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 0021658eb41..b783f43795e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -74,16 +74,16 @@ class boss_volkhan : public CreatureScript public: boss_volkhan() : CreatureScript("boss_volkhan") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_volkhanAI(pCreature); + return new boss_volkhanAI(creature); } struct boss_volkhanAI : public ScriptedAI { - boss_volkhanAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_volkhanAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -348,9 +348,9 @@ public: case 5: // 5 - Spawn the Golems - if (Creature* pCreatureTarget = GetClosestCreatureWithEntry(me, NPC_VOLKHAN_ANVIL, 1000.0f, true)) + if (Creature* creatureTarget = GetClosestCreatureWithEntry(me, NPC_VOLKHAN_ANVIL, 1000.0f, true)) for (uint8 i = 0; i < MAX_GOLEM; ++i) - me->CastSpell(pCreatureTarget, SPELL_SUMMON_MOLTEN_GOLEM, true); + me->CastSpell(creatureTarget, SPELL_SUMMON_MOLTEN_GOLEM, true); m_bIsStriking = true; m_uiSummonPhase = 0; // Reset back to Phase 0 for next time @@ -371,14 +371,14 @@ class mob_molten_golem : public CreatureScript public: mob_molten_golem() : CreatureScript("mob_molten_golem") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_molten_golemAI(pCreature); + return new mob_molten_golemAI(creature); } struct mob_molten_golemAI : public ScriptedAI { - mob_molten_golemAI(Creature* pCreature) : ScriptedAI(pCreature) { } + mob_molten_golemAI(Creature* creature) : ScriptedAI(creature) { } bool m_bIsFrozen; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 0ab8eff0d58..93a7848bd6f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -54,9 +54,9 @@ class boss_krystallus : public CreatureScript public: boss_krystallus() : CreatureScript("boss_krystallus") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_krystallusAI (pCreature); + return new boss_krystallusAI (creature); } struct boss_krystallusAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 0fb965bde55..1d01173a6ab 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -58,9 +58,9 @@ class boss_maiden_of_grief : public CreatureScript public: boss_maiden_of_grief() : CreatureScript("boss_maiden_of_grief") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_maiden_of_griefAI (pCreature); + return new boss_maiden_of_griefAI (creature); } struct boss_maiden_of_griefAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 18d336582b6..97af158a357 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -83,9 +83,9 @@ class boss_sjonnir : public CreatureScript public: boss_sjonnir() : CreatureScript("boss_sjonnir") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_sjonnirAI (pCreature); + return new boss_sjonnirAI (creature); } struct boss_sjonnirAI : public ScriptedAI @@ -251,9 +251,9 @@ class mob_malformed_ooze : public CreatureScript public: mob_malformed_ooze() : CreatureScript("mob_malformed_ooze") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_malformed_oozeAI(pCreature); + return new mob_malformed_oozeAI(creature); } struct mob_malformed_oozeAI : public ScriptedAI @@ -294,9 +294,9 @@ class mob_iron_sludge : public CreatureScript public: mob_iron_sludge() : CreatureScript("mob_iron_sludge") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_iron_sludgeAI(pCreature); + return new mob_iron_sludgeAI(creature); } struct mob_iron_sludgeAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 7c73f1900ff..13cb758f155 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -135,9 +135,9 @@ class mob_tribuna_controller : public CreatureScript public: mob_tribuna_controller() : CreatureScript("mob_tribuna_controller") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_tribuna_controllerAI(pCreature); + return new mob_tribuna_controllerAI(creature); } struct mob_tribuna_controllerAI : public ScriptedAI @@ -268,32 +268,32 @@ class npc_brann_hos : public CreatureScript public: npc_brann_hos() : CreatureScript("npc_brann_hos") { } - 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 || uiAction == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_brann_hos::npc_brann_hosAI, pCreature->AI())->StartWP(); + CAST_AI(npc_brann_hos::npc_brann_hosAI, creature->AI())->StartWP(); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(TEXT_ID_START, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(TEXT_ID_START, creature->GetGUID()); return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_brann_hosAI(pCreature); + return new npc_brann_hosAI(creature); } struct npc_brann_hosAI : public npc_escortAI @@ -351,12 +351,12 @@ public: switch(uiPointId) { case 7: - if (Creature* pCreature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) + if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) { - if (!pCreature->isAlive()) - pCreature->Respawn(); - CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pCreature->AI())->UpdateFacesList(); - uiControllerGUID = pCreature->GetGUID(); + if (!creature->isAlive()) + creature->Respawn(); + CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, creature->AI())->UpdateFacesList(); + uiControllerGUID = creature->GetGUID(); } break; case 13: diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 878f1213571..99bc6f1c4cd 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -74,9 +74,9 @@ class boss_algalon : public CreatureScript public: boss_algalon() : CreatureScript("boss_algalon") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return GetUlduarAI<boss_algalonAI>(pCreature); + return GetUlduarAI<boss_algalonAI>(creature); } struct boss_algalonAI : public ScriptedAI @@ -333,16 +333,16 @@ class mob_collapsing_star : public CreatureScript public: mob_collapsing_star() : CreatureScript("mob_collapsing_star") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_collapsing_starAI(pCreature); + return new mob_collapsing_starAI(creature); } struct mob_collapsing_starAI : public ScriptedAI { - mob_collapsing_starAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_collapsing_starAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index f45b0815abe..efaeae3fad3 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -362,9 +362,9 @@ class boss_saronite_animus : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_saronite_animusAI(pCreature); + return new boss_saronite_animusAI(creature); } }; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index 7a16644099d..0204aaa97d3 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -46,14 +46,14 @@ class boss_thorim : public CreatureScript public: boss_thorim() : CreatureScript("boss_thorim") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return GetUlduarAI<boss_thorimAI>(pCreature); + return GetUlduarAI<boss_thorimAI>(creature); } struct boss_thorimAI : public BossAI { - boss_thorimAI(Creature* pCreature) : BossAI(pCreature, BOSS_THORIM) + boss_thorimAI(Creature* creature) : BossAI(creature, BOSS_THORIM) { } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 082365565c4..2f2446cb94a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -181,14 +181,14 @@ class boss_xt002 : public CreatureScript public: boss_xt002() : CreatureScript("boss_xt002") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return GetUlduarAI<boss_xt002_AI>(pCreature); + return GetUlduarAI<boss_xt002_AI>(creature); } struct boss_xt002_AI : public BossAI { - boss_xt002_AI(Creature* pCreature) : BossAI(pCreature, BOSS_XT002) + boss_xt002_AI(Creature* creature) : BossAI(creature, BOSS_XT002) { } @@ -429,16 +429,16 @@ class mob_xt002_heart : public CreatureScript public: mob_xt002_heart() : CreatureScript("mob_xt002_heart") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_xt002_heartAI(pCreature); + return new mob_xt002_heartAI(creature); } struct mob_xt002_heartAI : public ScriptedAI { - mob_xt002_heartAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_xt002_heartAI(Creature* creature) : ScriptedAI(creature) { - _instance = pCreature->GetInstanceScript(); + _instance = creature->GetInstanceScript(); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_STUNNED | UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); } @@ -473,14 +473,14 @@ class mob_scrapbot : public CreatureScript public: mob_scrapbot() : CreatureScript("mob_scrapbot") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_scrapbotAI(pCreature); + return new mob_scrapbotAI(creature); } struct mob_scrapbotAI : public ScriptedAI { - mob_scrapbotAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_scrapbotAI(Creature* creature) : ScriptedAI(creature) { _instance = me->GetInstanceScript(); } @@ -530,16 +530,16 @@ class mob_pummeller : public CreatureScript public: mob_pummeller() : CreatureScript("mob_pummeller") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_pummellerAI(pCreature); + return new mob_pummellerAI(creature); } struct mob_pummellerAI : public ScriptedAI { - mob_pummellerAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_pummellerAI(Creature* creature) : ScriptedAI(creature) { - _instance = pCreature->GetInstanceScript(); + _instance = creature->GetInstanceScript(); } void Reset() @@ -632,16 +632,16 @@ class mob_boombot : public CreatureScript public: mob_boombot() : CreatureScript("mob_boombot") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_boombotAI(pCreature); + return new mob_boombotAI(creature); } struct mob_boombotAI : public ScriptedAI { - mob_boombotAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_boombotAI(Creature* creature) : ScriptedAI(creature) { - _instance = pCreature->GetInstanceScript(); + _instance = creature->GetInstanceScript(); } void Reset() @@ -711,14 +711,14 @@ class mob_life_spark : public CreatureScript public: mob_life_spark() : CreatureScript("mob_life_spark") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_life_sparkAI(pCreature); + return new mob_life_sparkAI(creature); } struct mob_life_sparkAI : public ScriptedAI { - mob_life_sparkAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_life_sparkAI(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 45445d57bf9..e6a6c27d33b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -76,9 +76,9 @@ class boss_ingvar_the_plunderer : public CreatureScript public: boss_ingvar_the_plunderer() : CreatureScript("boss_ingvar_the_plunderer") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ingvar_the_plundererAI(pCreature); + return new boss_ingvar_the_plundererAI(creature); } struct boss_ingvar_the_plundererAI : public ScriptedAI @@ -289,9 +289,9 @@ class mob_annhylde_the_caller : public CreatureScript public: mob_annhylde_the_caller() : CreatureScript("mob_annhylde_the_caller") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_annhylde_the_callerAI (pCreature); + return new mob_annhylde_the_callerAI (creature); } struct mob_annhylde_the_callerAI : public ScriptedAI @@ -402,9 +402,9 @@ class mob_ingvar_throw_dummy : public CreatureScript public: mob_ingvar_throw_dummy() : CreatureScript("mob_ingvar_throw_dummy") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ingvar_throw_dummyAI (pCreature); + return new mob_ingvar_throw_dummyAI (creature); } struct mob_ingvar_throw_dummyAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index e2705969544..964a7b3a9cd 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -65,9 +65,9 @@ class mob_frost_tomb : public CreatureScript public: mob_frost_tomb() : CreatureScript("mob_frost_tomb") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_frost_tombAI(pCreature); + return new mob_frost_tombAI(creature); } struct mob_frost_tombAI : public ScriptedAI @@ -117,9 +117,9 @@ class boss_keleseth : public CreatureScript public: boss_keleseth() : CreatureScript("boss_keleseth") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_kelesethAI (pCreature); + return new boss_kelesethAI (creature); } struct boss_kelesethAI : public ScriptedAI @@ -260,9 +260,9 @@ class mob_vrykul_skeleton : public CreatureScript public: mob_vrykul_skeleton() : CreatureScript("mob_vrykul_skeleton") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_vrykul_skeletonAI (pCreature); + return new mob_vrykul_skeletonAI (creature); } struct mob_vrykul_skeletonAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index b5cb5076e5b..34825cec9bf 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -62,9 +62,9 @@ class boss_skarvald_the_constructor : public CreatureScript public: boss_skarvald_the_constructor() : CreatureScript("boss_skarvald_the_constructor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_skarvald_the_constructorAI (pCreature); + return new boss_skarvald_the_constructorAI (creature); } struct boss_skarvald_the_constructorAI : public ScriptedAI @@ -214,9 +214,9 @@ class boss_dalronn_the_controller : public CreatureScript public: boss_dalronn_the_controller() : CreatureScript("boss_dalronn_the_controller") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_dalronn_the_controllerAI (pCreature); + return new boss_dalronn_the_controllerAI (creature); } struct boss_dalronn_the_controllerAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index a324fd3eedf..cbdb1743e3e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -30,9 +30,9 @@ class npc_dragonflayer_forge_master : public CreatureScript public: npc_dragonflayer_forge_master() : CreatureScript("npc_dragonflayer_forge_master") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_dragonflayer_forge_masterAI(pCreature); + return new npc_dragonflayer_forge_masterAI(creature); } struct npc_dragonflayer_forge_masterAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index edc0de10eeb..1d298fd71b9 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -87,9 +87,9 @@ class boss_palehoof : public CreatureScript public: boss_palehoof() : CreatureScript("boss_palehoof") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_palehoofAI (pCreature); + return new boss_palehoofAI (creature); } struct boss_palehoofAI : public ScriptedAI @@ -290,9 +290,9 @@ class mob_ravenous_furbolg : public CreatureScript public: mob_ravenous_furbolg() : CreatureScript("mob_ravenous_furbolg") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ravenous_furbolgAI (pCreature); + return new mob_ravenous_furbolgAI (creature); } struct mob_ravenous_furbolgAI : public ScriptedAI @@ -403,9 +403,9 @@ class mob_frenzied_worgen : public CreatureScript public: mob_frenzied_worgen() : CreatureScript("mob_frenzied_worgen") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_frenzied_worgenAI (pCreature); + return new mob_frenzied_worgenAI (creature); } struct mob_frenzied_worgenAI : public ScriptedAI @@ -519,9 +519,9 @@ class mob_ferocious_rhino : public CreatureScript public: mob_ferocious_rhino() : CreatureScript("mob_ferocious_rhino") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ferocious_rhinoAI (pCreature); + return new mob_ferocious_rhinoAI (creature); } struct mob_ferocious_rhinoAI : public ScriptedAI @@ -639,9 +639,9 @@ class mob_massive_jormungar : public CreatureScript public: mob_massive_jormungar() : CreatureScript("mob_massive_jormungar") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_massive_jormungarAI (pCreature); + return new mob_massive_jormungarAI (creature); } struct mob_massive_jormungarAI : public ScriptedAI @@ -745,9 +745,9 @@ class mob_palehoof_orb : public CreatureScript public: mob_palehoof_orb() : CreatureScript("mob_palehoof_orb") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_palehoof_orbAI (pCreature); + return new mob_palehoof_orbAI (creature); } struct mob_palehoof_orbAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 589ceb64fcb..ada806eda84 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -161,9 +161,9 @@ class boss_skadi : public CreatureScript public: boss_skadi() : CreatureScript("boss_skadi") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_skadiAI (pCreature); + return new boss_skadiAI (creature); } struct boss_skadiAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index c7deb9f1a6f..41f2f6d9458 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -89,9 +89,9 @@ class boss_svala : public CreatureScript public: boss_svala() : CreatureScript("boss_svala") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_svalaAI (pCreature); + return new boss_svalaAI (creature); } struct boss_svalaAI : public ScriptedAI @@ -212,9 +212,9 @@ class mob_ritual_channeler : public CreatureScript public: mob_ritual_channeler() : CreatureScript("mob_ritual_channeler") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ritual_channelerAI(pCreature); + return new mob_ritual_channelerAI(creature); } struct mob_ritual_channelerAI : public Scripted_NoMovementAI @@ -251,9 +251,9 @@ class boss_svala_sorrowgrave : public CreatureScript public: boss_svala_sorrowgrave() : CreatureScript("boss_svala_sorrowgrave") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_svala_sorrowgraveAI(pCreature); + return new boss_svala_sorrowgraveAI(creature); } struct boss_svala_sorrowgraveAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 100d3496215..85851b673cb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -101,9 +101,9 @@ class boss_ymiron : public CreatureScript public: boss_ymiron() : CreatureScript("boss_ymiron") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ymironAI(pCreature); + return new boss_ymironAI(creature); } struct boss_ymironAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 0d24b92620e..53f62d3e534 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -50,9 +50,9 @@ class boss_cyanigosa : public CreatureScript public: boss_cyanigosa() : CreatureScript("boss_cyanigosa") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_cyanigosaAI (pCreature); + return new boss_cyanigosaAI (creature); } struct boss_cyanigosaAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index c621fbc5f1c..4afe6dfe8d8 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -48,9 +48,9 @@ class boss_erekem : public CreatureScript public: boss_erekem() : CreatureScript("boss_erekem") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_erekemAI (pCreature); + return new boss_erekemAI (creature); } struct boss_erekemAI : public ScriptedAI @@ -263,9 +263,9 @@ class mob_erekem_guard : public CreatureScript public: mob_erekem_guard() : CreatureScript("mob_erekem_guard") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_erekem_guardAI (pCreature); + return new mob_erekem_guardAI (creature); } struct mob_erekem_guardAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index f1c72e1becb..e18793ee41b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -74,16 +74,16 @@ class boss_ichoron : public CreatureScript public: boss_ichoron() : CreatureScript("boss_ichoron") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_ichoronAI (pCreature); + return new boss_ichoronAI (creature); } struct boss_ichoronAI : public ScriptedAI { - boss_ichoronAI(Creature* pCreature) : ScriptedAI(pCreature), m_waterElements(pCreature) + boss_ichoronAI(Creature* creature) : ScriptedAI(creature), m_waterElements(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } bool bIsExploded; @@ -336,16 +336,16 @@ class mob_ichor_globule : public CreatureScript public: mob_ichor_globule() : CreatureScript("mob_ichor_globule") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ichor_globuleAI (pCreature); + return new mob_ichor_globuleAI (creature); } struct mob_ichor_globuleAI : public ScriptedAI { - mob_ichor_globuleAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_ichor_globuleAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 6988f5f0714..ab860434ded 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -34,9 +34,9 @@ class boss_lavanthor : public CreatureScript public: boss_lavanthor() : CreatureScript("boss_lavanthor") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_lavanthorAI (pCreature); + return new boss_lavanthorAI (creature); } struct boss_lavanthorAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index da0294d7d89..f7f2c5e5478 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -30,9 +30,9 @@ class boss_moragg : public CreatureScript public: boss_moragg() : CreatureScript("boss_moragg") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_moraggAI (pCreature); + return new boss_moraggAI (creature); } struct boss_moraggAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index ff7a67b6a29..6277367d622 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -62,16 +62,16 @@ class boss_xevozz : public CreatureScript public: boss_xevozz() : CreatureScript("boss_xevozz") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_xevozzAI (pCreature); + return new boss_xevozzAI (creature); } struct boss_xevozzAI : public ScriptedAI { - boss_xevozzAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_xevozzAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -229,16 +229,16 @@ class mob_ethereal_sphere : public CreatureScript public: mob_ethereal_sphere() : CreatureScript("mob_ethereal_sphere") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_ethereal_sphereAI (pCreature); + return new mob_ethereal_sphereAI (creature); } struct mob_ethereal_sphereAI : public ScriptedAI { - mob_ethereal_sphereAI(Creature* pCreature) : ScriptedAI(pCreature) + mob_ethereal_sphereAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 1e795e86759..88edcdc36c3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -54,9 +54,9 @@ class boss_zuramat : public CreatureScript public: boss_zuramat() : CreatureScript("boss_zuramat") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new boss_zuramatAI (pCreature); + return new boss_zuramatAI (creature); } struct boss_zuramatAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index e250cfa399d..6331833bcda 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -253,19 +253,19 @@ class npc_sinclari_vh : public CreatureScript public: npc_sinclari_vh() : CreatureScript("npc_sinclari_vh") { } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_sinclari_vh::npc_sinclariAI, (pCreature->AI()))->uiPhase = 1; - if (InstanceScript *pInstance = pCreature->GetInstanceScript()) + CAST_AI(npc_sinclari_vh::npc_sinclariAI, (creature->AI()))->uiPhase = 1; + if (InstanceScript *pInstance = creature->GetInstanceScript()) pInstance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->SEND_GOSSIP_MENU(13854, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(13854, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(), playerTeleportPosition.GetPositionY(), playerTeleportPosition.GetPositionZ(), playerTeleportPosition.GetOrientation(), true); @@ -275,9 +275,9 @@ public: return true; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (InstanceScript* pInstance = pCreature->GetInstanceScript()) + if (InstanceScript* pInstance = creature->GetInstanceScript()) { switch (pInstance->GetData(DATA_MAIN_EVENT_PHASE)) { @@ -285,29 +285,29 @@ public: case FAIL: // Allow to start event if not started or wiped pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(13853, creature->GetGUID()); break; case IN_PROGRESS: // Allow to teleport inside if event is in progress pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_I_WANT_IN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(13853, creature->GetGUID()); break; default: - pPlayer->SEND_GOSSIP_MENU(13910, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(13910, creature->GetGUID()); } } return true; } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_sinclariAI(pCreature); + return new npc_sinclariAI(creature); } struct npc_sinclariAI : public ScriptedAI { - npc_sinclariAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_sinclariAI(Creature* creature) : ScriptedAI(creature) { - pInstance = pCreature->GetInstanceScript(); + pInstance = creature->GetInstanceScript(); } InstanceScript* pInstance; @@ -419,9 +419,9 @@ class mob_azure_saboteur : public CreatureScript public: mob_azure_saboteur() : CreatureScript("mob_azure_saboteur") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_saboteurAI (pCreature); + return new mob_azure_saboteurAI (creature); } struct mob_azure_saboteurAI : public npc_escortAI @@ -543,9 +543,9 @@ class npc_teleportation_portal_vh : public CreatureScript public: npc_teleportation_portal_vh() : CreatureScript("npc_teleportation_portal_vh") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_teleportation_portalAI(pCreature); + return new npc_teleportation_portalAI(creature); } struct npc_teleportation_portalAI : public ScriptedAI @@ -801,9 +801,9 @@ class mob_azure_invader : public CreatureScript public: mob_azure_invader() : CreatureScript("mob_azure_invader") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_invaderAI (pCreature); + return new mob_azure_invaderAI (creature); } struct mob_azure_invaderAI : public violet_hold_trashAI @@ -879,9 +879,9 @@ class mob_azure_binder : public CreatureScript public: mob_azure_binder() : CreatureScript("mob_azure_binder") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_binderAI (pCreature); + return new mob_azure_binderAI (creature); } struct mob_azure_binderAI : public violet_hold_trashAI @@ -957,9 +957,9 @@ class mob_azure_mage_slayer : public CreatureScript public: mob_azure_mage_slayer() : CreatureScript("mob_azure_mage_slayer") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_mage_slayerAI (pCreature); + return new mob_azure_mage_slayerAI (creature); } struct mob_azure_mage_slayerAI : public violet_hold_trashAI @@ -1017,9 +1017,9 @@ class mob_azure_raider : public CreatureScript public: mob_azure_raider() : CreatureScript("mob_azure_raider") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_raiderAI (pCreature); + return new mob_azure_raiderAI (creature); } struct mob_azure_raiderAI : public violet_hold_trashAI @@ -1069,9 +1069,9 @@ class mob_azure_stalker : public CreatureScript public: mob_azure_stalker() : CreatureScript("mob_azure_stalker") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_stalkerAI (pCreature); + return new mob_azure_stalkerAI (creature); } struct mob_azure_stalkerAI : public violet_hold_trashAI @@ -1201,9 +1201,9 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_spellbreakerAI (pCreature); + return new mob_azure_spellbreakerAI (creature); } }; @@ -1212,9 +1212,9 @@ class mob_azure_captain : public CreatureScript public: mob_azure_captain() : CreatureScript("mob_azure_captain") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_captainAI (pCreature); + return new mob_azure_captainAI (creature); } struct mob_azure_captainAI : public violet_hold_trashAI @@ -1264,9 +1264,9 @@ class mob_azure_sorceror : public CreatureScript public: mob_azure_sorceror() : CreatureScript("mob_azure_sorceror") { } - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new mob_azure_sorcerorAI (pCreature); + return new mob_azure_sorcerorAI (creature); } struct mob_azure_sorcerorAI : public violet_hold_trashAI diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 641301a17d8..e0da10182f9 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -215,20 +215,20 @@ class npc_keristrasza : public CreatureScript public: npc_keristrasza() : CreatureScript("npc_keristrasza") { } - 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(11957) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_KERI, 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) @@ -261,19 +261,19 @@ class npc_corastrasza : public CreatureScript public: npc_corastrasza() : CreatureScript("npc_corastrasza") { } - 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_ACES_HIGH) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_ACES_HIGH_DAILY) == QUEST_STATUS_INCOMPLETE) //It's the same dragon for both quests. pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_C_1, 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) @@ -307,17 +307,17 @@ class npc_iruk : public CreatureScript public: npc_iruk() : CreatureScript("npc_iruk") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_SPIRITS_WATCH_OVER_US) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_I, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXT_I, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXT_I, 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) @@ -397,7 +397,7 @@ public: struct npc_scourge_prisonerAI : public ScriptedAI { - npc_scourge_prisonerAI(Creature* pCreature) : ScriptedAI (pCreature){} + npc_scourge_prisonerAI(Creature* creature) : ScriptedAI (creature){} void Reset() { @@ -439,7 +439,7 @@ public: struct npc_jennyAI : public ScriptedAI { - npc_jennyAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_jennyAI(Creature* creature) : ScriptedAI(creature) {} bool setCrateNumber; @@ -500,7 +500,7 @@ public: struct npc_fezzix_geartwistAI : public ScriptedAI { - npc_fezzix_geartwistAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_fezzix_geartwistAI(Creature* creature) : ScriptedAI(creature) {} void MoveInLineOfSight(Unit* pWho) { @@ -704,7 +704,7 @@ public: struct npc_lurgglbrAI : public npc_escortAI { - npc_lurgglbrAI(Creature* pCreature) : npc_escortAI(pCreature){} + npc_lurgglbrAI(Creature* creature) : npc_escortAI(creature){} uint32 IntroTimer; uint32 IntroPhase; @@ -794,28 +794,28 @@ public: return new npc_lurgglbrAI(creature); } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const *pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *pQuest) { if (pQuest->GetQuestId() == QUEST_ESCAPE_WINTERFIN_CAVERNS) { - if (GameObject* pGo = pCreature->FindNearestGameObject(GO_CAGE, 5.0f)) + if (GameObject* pGo = creature->FindNearestGameObject(GO_CAGE, 5.0f)) { pGo->SetRespawnTime(0); pGo->SetGoType(GAMEOBJECT_TYPE_BUTTON); pGo->UseDoorOrButton(20); } - if (npc_escortAI* pEscortAI = CAST_AI(npc_lurgglbr::npc_lurgglbrAI, pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_lurgglbr::npc_lurgglbrAI, creature->AI())) pEscortAI->Start(true, false, pPlayer->GetGUID()); switch (pPlayer->GetTeam()) { case ALLIANCE: - pCreature->setFaction(FACTION_ESCORTEE_A); + creature->setFaction(FACTION_ESCORTEE_A); break; default: case HORDE: - pCreature->setFaction(FACTION_ESCORTEE_H); + creature->setFaction(FACTION_ESCORTEE_H); break; } @@ -978,7 +978,7 @@ public: struct npc_thassarianAI : public npc_escortAI { - npc_thassarianAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_thassarianAI(Creature* creature) : npc_escortAI(creature) { } @@ -1243,27 +1243,27 @@ public: } }; - 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_LAST_RITES) == QUEST_STATUS_INCOMPLETE && pCreature->GetAreaId() == 4128) + if (pPlayer->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE && creature->GetAreaId() == 4128) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_T, 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: - CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); - CAST_AI(npc_escortAI, (pCreature->AI()))->SetMaxPlayerDistance(200.0f); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (creature->AI()))->SetMaxPlayerDistance(200.0f); break; } return true; @@ -1286,7 +1286,7 @@ public: struct npc_image_lich_kingAI : public ScriptedAI { - npc_image_lich_kingAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_image_lich_kingAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { @@ -1321,7 +1321,7 @@ public: struct npc_general_arlosAI : public ScriptedAI { - npc_general_arlosAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_general_arlosAI(Creature* creature) : ScriptedAI(creature) {} void MovementInform(uint32 uiType, uint32 /*uiId*/) { @@ -1359,9 +1359,9 @@ public: struct npc_counselor_talbotAI : public ScriptedAI { - npc_counselor_talbotAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_counselor_talbotAI(Creature* creature) : ScriptedAI(creature) { - pCreature->RestoreFaction(); + creature->RestoreFaction(); } uint64 LeryssaGUID; @@ -1471,13 +1471,13 @@ public: struct npc_leryssaAI : public ScriptedAI { - npc_leryssaAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_leryssaAI(Creature* creature) : ScriptedAI(creature) { bDone = false; Phase = 0; uiPhaseTimer = 0; - pCreature->RemoveStandFlags(UNIT_STAND_STATE_SIT); + creature->RemoveStandFlags(UNIT_STAND_STATE_SIT); } bool bDone; @@ -1606,7 +1606,7 @@ public: struct npc_beryl_sorcererAI : public FollowerAI { - npc_beryl_sorcererAI(Creature* pCreature) : FollowerAI(pCreature) {} + npc_beryl_sorcererAI(Creature* creature) : FollowerAI(creature) {} bool bEnslaved; @@ -1688,7 +1688,7 @@ public: struct npc_imprisoned_beryl_sorcererAI : public ScriptedAI { - npc_imprisoned_beryl_sorcererAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_imprisoned_beryl_sorcererAI(Creature* creature) : ScriptedAI(creature) {} uint64 CasterGUID; @@ -1819,21 +1819,21 @@ class npc_mootoo_the_younger : public CreatureScript public: npc_mootoo_the_younger() : CreatureScript("npc_mootoo_the_younger") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_ESCAPING_THE_MIST) { switch (pPlayer->GetTeam()) { case ALLIANCE: - pCreature->setFaction(FACTION_ESCORTEE_A); + creature->setFaction(FACTION_ESCORTEE_A); break; case HORDE: - pCreature->setFaction(FACTION_ESCORTEE_H); + creature->setFaction(FACTION_ESCORTEE_H); break; } - DoScriptText(SAY_1, pCreature); - CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); + DoScriptText(SAY_1, creature); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); } return true; } @@ -1912,21 +1912,21 @@ class npc_bonker_togglevolt : public CreatureScript public: npc_bonker_togglevolt() : CreatureScript("npc_bonker_togglevolt") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_GET_ME_OUTA_HERE) { switch (pPlayer->GetTeam()) { case ALLIANCE: - pCreature->setFaction(FACTION_ESCORTEE_A); + creature->setFaction(FACTION_ESCORTEE_A); break; case HORDE: - pCreature->setFaction(FACTION_ESCORTEE_H); + creature->setFaction(FACTION_ESCORTEE_H); break; } - DoScriptText(SAY_bonker_2, pCreature, pPlayer); - CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, true, pPlayer->GetGUID()); + DoScriptText(SAY_bonker_2, creature, pPlayer); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, true, pPlayer->GetGUID()); } return true; } @@ -2269,7 +2269,7 @@ public: struct npc_warmage_coldarraAI : public Scripted_NoMovementAI { - npc_warmage_coldarraAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature){} + npc_warmage_coldarraAI(Creature* creature) : Scripted_NoMovementAI(creature){} uint32 m_uiTimer; //Timer until recast @@ -2386,10 +2386,10 @@ public: struct npc_hidden_cultistAI : public ScriptedAI { - npc_hidden_cultistAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_hidden_cultistAI(Creature* creature) : ScriptedAI(creature) { - uiEmoteState = pCreature->GetUInt32Value(UNIT_NPC_EMOTESTATE); - uiNpcFlags = pCreature->GetUInt32Value(UNIT_NPC_FLAGS); + uiEmoteState = creature->GetUInt32Value(UNIT_NPC_EMOTESTATE); + uiNpcFlags = creature->GetUInt32Value(UNIT_NPC_FLAGS); } uint32 uiEmoteState; @@ -2507,17 +2507,17 @@ public: } }; - CreatureAI* GetAI(Creature* pCreature) const + CreatureAI* GetAI(Creature* creature) const { - return new npc_hidden_cultistAI(pCreature); + return new npc_hidden_cultistAI(creature); } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { uint32 uiGossipText = 0; const char* charGossipItem; - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case NPC_TOM_HEGGER: uiGossipText = GOSSIP_TEXT_TOM_HEGGER; @@ -2539,27 +2539,27 @@ public: if (pPlayer->HasAura(SPELL_RIGHTEOUS_VISION) && pPlayer->GetQuestStatus(QUEST_THE_HUNT_IS_ON) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, charGossipItem, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - if (pCreature->isVendor()) + if (creature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(uiGossipText, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(uiGossipText, creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->AI()->SetGUID(pPlayer->GetGUID()); - pCreature->AI()->DoAction(1); + creature->AI()->SetGUID(pPlayer->GetGUID()); + creature->AI()->DoAction(1); } if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(creature->GetGUID()); return true; } diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/crystalsong_forest.cpp index 8392c57ea26..a35e4781971 100644 --- a/src/server/scripts/Northrend/crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/crystalsong_forest.cpp @@ -49,7 +49,7 @@ public: struct npc_warmage_violetstandAI : public Scripted_NoMovementAI { - npc_warmage_violetstandAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature){} + npc_warmage_violetstandAI(Creature* creature) : Scripted_NoMovementAI(creature){} uint64 uiTargetGUID; diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp index 74f6bbf4f49..e5d5bac1ed6 100644 --- a/src/server/scripts/Northrend/dalaran.cpp +++ b/src/server/scripts/Northrend/dalaran.cpp @@ -48,11 +48,11 @@ public: struct npc_mageguard_dalaranAI : public Scripted_NoMovementAI { - npc_mageguard_dalaranAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) + npc_mageguard_dalaranAI(Creature* creature) : Scripted_NoMovementAI(creature) { - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pCreature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_NORMAL, true); - pCreature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_NORMAL, true); + creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } void Reset(){} @@ -130,9 +130,9 @@ class npc_hira_snowdawn : public CreatureScript public: npc_hira_snowdawn() : CreatureScript("npc_hira_snowdawn") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (!pCreature->isVendor() || !pCreature->isTrainer()) + if (!creature->isVendor() || !creature->isTrainer()) return false; pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_TRAIN_HIRA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); @@ -140,19 +140,19 @@ public: if (pPlayer->getLevel() >= 80 && pPlayer->HasSpell(SPELL_COLD_WEATHER_FLYING)) 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_TRAIN) - pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(creature->GetGUID()); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(creature->GetGUID()); return true; } diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp index 69a2bb8bb51..05348f36f19 100644 --- a/src/server/scripts/Northrend/dragonblight.cpp +++ b/src/server/scripts/Northrend/dragonblight.cpp @@ -44,19 +44,19 @@ class npc_alexstrasza_wr_gate : public CreatureScript public: npc_alexstrasza_wr_gate() : CreatureScript("npc_alexstrasza_wr_gate") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); if (pPlayer->GetQuestRewardStatus(QUEST_RETURN_TO_AG_A) || pPlayer->GetQuestRewardStatus(QUEST_RETURN_TO_AG_H)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WHAT_HAPPENED, 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) diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 4f77010203e..80f150457ff 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -61,20 +61,20 @@ class npc_orsonn_and_kodian : public CreatureScript public: npc_orsonn_and_kodian() : CreatureScript("npc_orsonn_and_kodian") { } - 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_CHILDREN_OF_URSOC) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_THE_BEAR_GODS_OFFSPRING) == QUEST_STATUS_INCOMPLETE) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case NPC_ORSONN: if (!pPlayer->GetReqKillOrCastCurrentCount(QUEST_CHILDREN_OF_URSOC, NPC_ORSONN_CREDIT) || !pPlayer->GetReqKillOrCastCurrentCount(QUEST_THE_BEAR_GODS_OFFSPRING, NPC_ORSONN_CREDIT)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ORSONN1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ORSONN1, creature->GetGUID()); return true; } break; @@ -82,42 +82,42 @@ public: if (!pPlayer->GetReqKillOrCastCurrentCount(QUEST_CHILDREN_OF_URSOC, NPC_KODIAN_CREDIT) || !pPlayer->GetReqKillOrCastCurrentCount(QUEST_THE_BEAR_GODS_OFFSPRING, NPC_KODIAN_CREDIT)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_KODIAN1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_KODIAN1, creature->GetGUID()); return true; } break; } } - 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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ORSONN2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ORSONN2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ORSONN3, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ORSONN3, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->TalkedToCreature(NPC_ORSONN_CREDIT, pCreature->GetGUID()); + pPlayer->TalkedToCreature(NPC_ORSONN_CREDIT, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_KODIAN2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_KODIAN2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->TalkedToCreature(NPC_KODIAN_CREDIT, pCreature->GetGUID()); + pPlayer->TalkedToCreature(NPC_KODIAN_CREDIT, creature->GetGUID()); break; } @@ -163,7 +163,7 @@ public: struct npc_emilyAI : public npc_escortAI { - npc_emilyAI(Creature* pCreature) : npc_escortAI(pCreature) { } + npc_emilyAI(Creature* creature) : npc_escortAI(creature) { } uint32 m_uiChatTimer; @@ -309,17 +309,17 @@ public: } }; - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_PERILOUS_ADVENTURE) { - DoScriptText(SAY_QUEST_ACCEPT, pCreature); - if (Creature* Mrfloppy = GetClosestCreatureWithEntry(pCreature, NPC_MRFLOPPY, 180.0f)) + DoScriptText(SAY_QUEST_ACCEPT, creature); + if (Creature* Mrfloppy = GetClosestCreatureWithEntry(creature, NPC_MRFLOPPY, 180.0f)) { - Mrfloppy->GetMotionMaster()->MoveFollow(pCreature, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); + Mrfloppy->GetMotionMaster()->MoveFollow(creature, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - if (npc_escortAI* pEscortAI = CAST_AI(npc_emily::npc_emilyAI, (pCreature->AI()))) + if (npc_escortAI* pEscortAI = CAST_AI(npc_emily::npc_emilyAI, (creature->AI()))) pEscortAI->Start(true, false, pPlayer->GetGUID()); } return true; @@ -404,7 +404,7 @@ public: struct npc_outhouse_bunnyAI : public ScriptedAI { - npc_outhouse_bunnyAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_outhouse_bunnyAI(Creature* creature) : ScriptedAI(creature) {} uint8 m_counter; uint8 m_gender; @@ -460,7 +460,7 @@ public: struct npc_tallhorn_stagAI : public ScriptedAI { - npc_tallhorn_stagAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_tallhorn_stagAI(Creature* creature) : ScriptedAI(creature) {} uint8 m_uiPhase; @@ -504,7 +504,7 @@ public: struct npc_amberpine_woodsmanAI : public ScriptedAI { - npc_amberpine_woodsmanAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_amberpine_woodsmanAI(Creature* creature) : ScriptedAI(creature) {} uint8 m_uiPhase; uint32 m_uiTimer; @@ -643,14 +643,14 @@ class npc_lightning_sentry : public CreatureScript public: npc_lightning_sentry() : CreatureScript("npc_lightning_sentry") { } - CreatureAI *GetAI(Creature* pCreature) const + CreatureAI *GetAI(Creature* creature) const { - return new npc_lightning_sentryAI(pCreature); + return new npc_lightning_sentryAI(creature); } struct npc_lightning_sentryAI : public ScriptedAI { - npc_lightning_sentryAI(Creature* pCreature) : ScriptedAI(pCreature) { } + npc_lightning_sentryAI(Creature* creature) : ScriptedAI(creature) { } uint32 uiChargedSentryTotem; @@ -710,14 +710,14 @@ class npc_venture_co_straggler : public CreatureScript public: npc_venture_co_straggler() : CreatureScript("npc_venture_co_straggler") { } - CreatureAI *GetAI(Creature* pCreature) const + CreatureAI *GetAI(Creature* creature) const { - return new npc_venture_co_stragglerAI(pCreature); + return new npc_venture_co_stragglerAI(creature); } struct npc_venture_co_stragglerAI : public ScriptedAI { - npc_venture_co_stragglerAI(Creature* pCreature) : ScriptedAI(pCreature) { } + npc_venture_co_stragglerAI(Creature* creature) : ScriptedAI(creature) { } uint64 uiPlayerGUID; uint32 uiRunAwayTimer; diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 4be95efa5c5..0155ba281c5 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -48,27 +48,27 @@ class npc_apothecary_hanes : public CreatureScript public: npc_apothecary_hanes() : CreatureScript("npc_apothecary_hanes") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_TRAIL_OF_FIRE) { switch (pPlayer->GetTeam()) { case ALLIANCE: - pCreature->setFaction(FACTION_ESCORTEE_A); + creature->setFaction(FACTION_ESCORTEE_A); break; case HORDE: - pCreature->setFaction(FACTION_ESCORTEE_H); + creature->setFaction(FACTION_ESCORTEE_H); break; } - CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); } return true; } struct npc_Apothecary_HanesAI : public npc_escortAI { - npc_Apothecary_HanesAI(Creature* pCreature) : npc_escortAI(pCreature){} + npc_Apothecary_HanesAI(Creature* creature) : npc_escortAI(creature){} uint32 PotTimer; void Reset () @@ -169,7 +169,7 @@ public: struct npc_plaguehound_trackerAI : public npc_escortAI { - npc_plaguehound_trackerAI(Creature* pCreature) : npc_escortAI(pCreature) { } + npc_plaguehound_trackerAI(Creature* creature) : npc_escortAI(creature) { } void Reset() { @@ -225,19 +225,19 @@ class npc_razael_and_lyana : public CreatureScript public: npc_razael_and_lyana() : CreatureScript("npc_razael_and_lyana") { } - 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_REPORTS_FROM_THE_FIELD) == QUEST_STATUS_INCOMPLETE) - switch (pCreature->GetEntry()) + switch (creature->GetEntry()) { case NPC_RAZAEL: if (!pPlayer->GetReqKillOrCastCurrentCount(QUEST_REPORTS_FROM_THE_FIELD, NPC_RAZAEL)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_RAZAEL_REPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_RAZAEL1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_RAZAEL1, creature->GetGUID()); return true; } break; @@ -245,27 +245,27 @@ public: if (!pPlayer->GetReqKillOrCastCurrentCount(QUEST_REPORTS_FROM_THE_FIELD, NPC_LYANA)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LYANA_REPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LYANA1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LYANA1, creature->GetGUID()); return true; } break; } - 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_RAZAEL2, pCreature->GetGUID()); - pPlayer->TalkedToCreature(NPC_RAZAEL, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_RAZAEL2, creature->GetGUID()); + pPlayer->TalkedToCreature(NPC_RAZAEL, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LYANA2, pCreature->GetGUID()); - pPlayer->TalkedToCreature(NPC_LYANA, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LYANA2, creature->GetGUID()); + pPlayer->TalkedToCreature(NPC_LYANA, creature->GetGUID()); break; } return true; @@ -294,23 +294,23 @@ class npc_mcgoyver : public CreatureScript public: npc_mcgoyver() : CreatureScript("npc_mcgoyver") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_WE_CAN_REBUILD_IT) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_I, 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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_II, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_MCGOYVER, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_MCGOYVER, creature->GetGUID()); pPlayer->CastSpell(pPlayer, SPELL_CREATURE_DARK_IRON_INGOTS, true); break; case GOSSIP_ACTION_INFO_DEF+2: @@ -348,11 +348,11 @@ class npc_daegarn : public CreatureScript public: npc_daegarn() : CreatureScript("npc_daegarn") { } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_DEFEAT_AT_RING) { - if (npc_daegarnAI* pDaegarnAI = CAST_AI(npc_daegarn::npc_daegarnAI, pCreature->AI())) + if (npc_daegarnAI* pDaegarnAI = CAST_AI(npc_daegarn::npc_daegarnAI, creature->AI())) pDaegarnAI->StartEvent(pPlayer->GetGUID()); } @@ -362,7 +362,7 @@ public: // TODO: make prisoners help (unclear if summoned or using npc's from surrounding cages (summon inside small cages?)) struct npc_daegarnAI : public ScriptedAI { - npc_daegarnAI(Creature* pCreature) : ScriptedAI(pCreature) { } + npc_daegarnAI(Creature* creature) : ScriptedAI(creature) { } bool bEventInProgress; uint64 uiPlayerGUID; diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index bdc1489d610..04b62dc5a3b 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -59,50 +59,50 @@ class npc_arete : public CreatureScript public: npc_arete() : CreatureScript("npc_arete") { } - 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_THE_STORY_THUS_FAR) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE1, creature->GetGUID()); return true; } - 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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE3, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE3, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE4, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE4, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE5, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE5, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE6, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE6, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE7, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ARETE7, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->CLOSE_GOSSIP_MENU(); @@ -128,20 +128,20 @@ class npc_dame_evniki_kapsalis : public CreatureScript public: npc_dame_evniki_kapsalis() : CreatureScript("npc_dame_evniki_kapsalis") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->HasTitle(TITLE_CRUSADER)) 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; } }; @@ -168,7 +168,7 @@ class npc_squire_david : public CreatureScript public: npc_squire_david() : CreatureScript("npc_squire_david") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_H) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_A) == QUEST_STATUS_INCOMPLETE)//We need more info about it. @@ -177,17 +177,17 @@ public: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SQUIRE_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); } - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_SQUIRE, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_SQUIRE, creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->SummonCreature(NPC_ARGENT_VALIANT, 8575.451f, 952.472f, 547.554f, 0.38f); + creature->SummonCreature(NPC_ARGENT_VALIANT, 8575.451f, 952.472f, 547.554f, 0.38f); } return true; } @@ -212,10 +212,10 @@ public: struct npc_argent_valiantAI : public ScriptedAI { - npc_argent_valiantAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_argent_valiantAI(Creature* creature) : ScriptedAI(creature) { - pCreature->GetMotionMaster()->MovePoint(0, 8599.258f, 963.951f, 547.553f); - pCreature->setFaction(35); //wrong faction in db? + creature->GetMotionMaster()->MovePoint(0, 8599.258f, 963.951f, 547.553f); + creature->setFaction(35); //wrong faction in db? } uint32 uiChargeTimer; @@ -295,7 +295,7 @@ public: struct npc_alorah_and_grimminAI : public ScriptedAI { - npc_alorah_and_grimminAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_alorah_and_grimminAI(Creature* creature) : ScriptedAI(creature) {} bool uiCast; @@ -354,7 +354,7 @@ public: struct npc_guardian_pavilionAI : public Scripted_NoMovementAI { - npc_guardian_pavilionAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) {} + npc_guardian_pavilionAI(Creature* creature) : Scripted_NoMovementAI(creature) {} void MoveInLineOfSight(Unit* pWho) { diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index f7011e00e6a..54d54d5a493 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -28,7 +28,7 @@ class npc_four_car_garage : public CreatureScript struct npc_four_car_garageAI : public NullCreatureAI { - npc_four_car_garageAI(Creature* pCreature) : NullCreatureAI(pCreature) { } + npc_four_car_garageAI(Creature* creature) : NullCreatureAI(creature) { } void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) { diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 63b89064b4d..3c54b3473b3 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -120,44 +120,44 @@ public: } }; - 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_FORTUNATE_MISUNDERSTANDINGS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_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(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { - CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); - CAST_AI(npc_escortAI, (pCreature->AI()))->SetMaxPlayerDistance(35.0f); - pCreature->SetUnitMovementFlags(MOVEMENTFLAG_JUMPING); - DoScriptText(SAY_START_IRO, pCreature); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (creature->AI()))->SetMaxPlayerDistance(35.0f); + creature->SetUnitMovementFlags(MOVEMENTFLAG_JUMPING); + DoScriptText(SAY_START_IRO, creature); switch (pPlayer->GetTeam()){ case ALLIANCE: - pCreature->setFaction(FACTION_ESCORTEE_A); + creature->setFaction(FACTION_ESCORTEE_A); break; case HORDE: - pCreature->setFaction(FACTION_ESCORTEE_H); + creature->setFaction(FACTION_ESCORTEE_H); break; } } return true; } - bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, Quest const* /*_Quest*/) + bool OnQuestAccept(Player* /*pPlayer*/, Creature* creature, Quest const* /*_Quest*/) { - DoScriptText(SAY_QUEST_ACCEPT_IRO, pCreature); + DoScriptText(SAY_QUEST_ACCEPT_IRO, creature); return false; } @@ -191,36 +191,36 @@ class npc_vekjik : public CreatureScript public: npc_vekjik() : CreatureScript("npc_vekjik") { } - 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_MAKING_PEACE) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_VEKJIK_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VEKJIK1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VEKJIK1, creature->GetGUID()); return true; } - 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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_VEKJIK_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VEKJIK2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VEKJIK2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); - DoScriptText(SAY_TEXTID_VEKJIK1, pCreature, pPlayer); + DoScriptText(SAY_TEXTID_VEKJIK1, creature, pPlayer); pPlayer->AreaExploredOrEventHappens(QUEST_MAKING_PEACE); - pCreature->CastSpell(pPlayer, SPELL_FREANZYHEARTS_FURY, false); + creature->CastSpell(pPlayer, SPELL_FREANZYHEARTS_FURY, false); break; } @@ -252,30 +252,30 @@ class npc_avatar_of_freya : public CreatureScript public: npc_avatar_of_freya() : CreatureScript("npc_avatar_of_freya") { } - 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_FREYA_PACT) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AOF1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXTID_AVATAR1, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXTID_AVATAR1, creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AOF2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXTID_AVATAR2, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXTID_AVATAR2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AOF3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXTID_AVATAR3, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXTID_AVATAR3, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CastSpell(pPlayer, SPELL_FREYA_CONVERSATION, true); @@ -297,7 +297,7 @@ public: struct npc_bushwhackerAI : public ScriptedAI { - npc_bushwhackerAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_bushwhackerAI(Creature* creature) : ScriptedAI(creature) { } @@ -356,7 +356,7 @@ public: struct npc_engineer_heliceAI : public npc_escortAI { - npc_engineer_heliceAI(Creature* pCreature) : npc_escortAI(pCreature) { } + npc_engineer_heliceAI(Creature* creature) : npc_escortAI(creature) { } uint32 m_uiChatTimer; @@ -433,17 +433,17 @@ public: return new npc_engineer_heliceAI(creature); } - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_DISASTER) { - if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, pCreature->AI())) + if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, creature->AI())) { - pCreature->GetMotionMaster()->MoveJumpTo(0, 0.4f, 0.4f); - pCreature->setFaction(113); + creature->GetMotionMaster()->MoveJumpTo(0, 0.4f, 0.4f); + creature->setFaction(113); pEscortAI->Start(false, false, pPlayer->GetGUID()); - DoScriptText(SAY_WP_1, pCreature); + DoScriptText(SAY_WP_1, creature); } } return true; @@ -481,7 +481,7 @@ public: struct npc_jungle_punch_targetAI : public ScriptedAI { - npc_jungle_punch_targetAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_jungle_punch_targetAI(Creature* creature) : ScriptedAI(creature) {} uint16 sayTimer; uint8 sayStep; @@ -587,9 +587,9 @@ public: } }; - CreatureAI *GetAI(Creature* pCreature) const + CreatureAI *GetAI(Creature* creature) const { - return new npc_jungle_punch_targetAI(pCreature); + return new npc_jungle_punch_targetAI(creature); } }; @@ -624,13 +624,13 @@ class npc_adventurous_dwarf : public CreatureScript public: npc_adventurous_dwarf() : CreatureScript("npc_adventurous_dwarf") { } - CreatureAI *GetAI(Creature* pCreature) const + CreatureAI *GetAI(Creature* creature) const { - DoScriptText(SAY_DWARF_OUCH, pCreature); + DoScriptText(SAY_DWARF_OUCH, creature); return NULL; } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_12634) != QUEST_STATUS_INCOMPLETE) return false; @@ -644,11 +644,11 @@ public: if (pPlayer->GetItemCount(ITEM_PAPAYA) < 1) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OPTION_PAPAYA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_MENU_DWARF, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_MENU_DWARF, 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(); uint32 spellId = 0; @@ -660,8 +660,8 @@ public: } if (spellId) pPlayer->CastSpell(pPlayer, spellId, true); - DoScriptText(SAY_DWARF_HELP, pCreature); - pCreature->DespawnOrUnsummon(); + DoScriptText(SAY_DWARF_HELP, creature); + creature->DespawnOrUnsummon(); return true; } }; diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index cc5754ffde2..c13ebd935f9 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -38,7 +38,7 @@ public: struct npc_agnetta_tyrsdottarAI : public ScriptedAI { - npc_agnetta_tyrsdottarAI(Creature* pCreature) : ScriptedAI(pCreature) { } + npc_agnetta_tyrsdottarAI(Creature* creature) : ScriptedAI(creature) { } void Reset() { @@ -51,24 +51,24 @@ public: return new npc_agnetta_tyrsdottarAI(creature); } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_ITS_THAT_YOUR_GOBLIN) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_AGNETTA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(13691, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(13691, 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) { - DoScriptText(SAY_AGGRO, pCreature); + DoScriptText(SAY_AGGRO, creature); pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->setFaction(FACTION_HOSTILE_AT1); - pCreature->AI()->AttackStart(pPlayer); + creature->setFaction(FACTION_HOSTILE_AT1); + creature->AI()->AttackStart(pPlayer); } return true; @@ -93,33 +93,33 @@ class npc_frostborn_scout : public CreatureScript public: npc_frostborn_scout() : CreatureScript("npc_frostborn_scout") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_MISSING_SCOUTS) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->PlayerTalkClass->SendGossipMenu(13611, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(13611, creature->GetGUID()); } return true; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->PlayerTalkClass->SendGossipMenu(13612, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(13612, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->PlayerTalkClass->SendGossipMenu(13613, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(13613, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->PlayerTalkClass->SendGossipMenu(13614, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(13614, creature->GetGUID()); pPlayer->AreaExploredOrEventHappens(QUEST_MISSING_SCOUTS); break; } @@ -152,35 +152,35 @@ class npc_thorim : public CreatureScript public: npc_thorim() : CreatureScript("npc_thorim") { } - 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_SIBLING_RIVALRY) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_THORIM1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_THORIM1, creature->GetGUID()); return true; } return false; } - 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(0, GOSSIP_SN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_THORIM2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_THORIM2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_SN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_THORIM3, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_THORIM3, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_SN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_THORIM4, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_THORIM4, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); @@ -207,7 +207,7 @@ public: struct npc_goblin_prisonerAI : public ScriptedAI { - npc_goblin_prisonerAI(Creature* pCreature) : ScriptedAI (pCreature){} + npc_goblin_prisonerAI(Creature* creature) : ScriptedAI (creature){} void Reset() { @@ -250,7 +250,7 @@ public: struct npc_victorious_challengerAI : public ScriptedAI { - npc_victorious_challengerAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_victorious_challengerAI(Creature* creature) : ScriptedAI(creature) {} uint32 SunderArmorTimer; uint32 RendTimer; @@ -291,29 +291,29 @@ public: }; - 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_TAKING_ALL_CHALLENGERS) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_DEFENDING_YOUR_TITLE) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CHALLENGER, 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; } return false; } - 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(14); - pCreature->AI()->AttackStart(pPlayer); + creature->setFaction(14); + creature->AI()->AttackStart(pPlayer); } return true; @@ -348,36 +348,36 @@ class npc_loklira_crone : public CreatureScript public: npc_loklira_crone() : CreatureScript("npc_loklira_crone") { } - 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_HYLDSMEET) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOKLIRACRONE, 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; } return false; } - 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_LOKLIRACRONE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LOK1, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LOK1, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOKLIRACRONE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LOK2, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LOK2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOKLIRACRONE3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LOK3, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_LOK3, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); @@ -408,7 +408,7 @@ public: struct npc_injured_goblinAI : public npc_escortAI { - npc_injured_goblinAI(Creature* pCreature) : npc_escortAI(pCreature) { } + npc_injured_goblinAI(Creature* creature) : npc_escortAI(creature) { } void WaypointReached(uint32 i) { @@ -450,38 +450,38 @@ public: return new npc_injured_goblinAI(creature); } - 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_BITTER_DEPARTURE) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->PlayerTalkClass->SendGossipMenu(9999999, pCreature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(9999999, creature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(999999, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(999999, creature->GetGUID()); return true; } - bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, Quest const *quest) + bool OnQuestAccept(Player* /*pPlayer*/, Creature* creature, Quest const *quest) { if (quest->GetQuestId() == QUEST_BITTER_DEPARTURE) - DoScriptText(SAY_QUEST_ACCEPT, pCreature); + DoScriptText(SAY_QUEST_ACCEPT, creature); return false; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); - npc_escortAI* pEscortAI = CAST_AI(npc_injured_goblin::npc_injured_goblinAI, pCreature->AI()); + npc_escortAI* pEscortAI = CAST_AI(npc_injured_goblin::npc_injured_goblinAI, creature->AI()); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pEscortAI->Start(true, true, pPlayer->GetGUID()); - pCreature->setFaction(113); + creature->setFaction(113); } return true; } @@ -499,35 +499,35 @@ class npc_roxi_ramrocket : public CreatureScript public: npc_roxi_ramrocket() : CreatureScript("npc_roxi_ramrocket") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { //Quest Menu - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (creature->isQuestGiver()) + pPlayer->PrepareQuestMenu(creature->GetGUID()); //Trainer Menu - if( pCreature->isTrainer() ) + if( creature->isTrainer() ) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //Vendor Menu - if( pCreature->isVendor() ) + if( creature->isVendor() ) if(pPlayer->HasSpell(SPELL_MECHANO_HOG) || pPlayer->HasSpell(SPELL_MEKGINEERS_CHOPPER)) 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 /*sender*/, uint32 action) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*sender*/, uint32 action) { pPlayer->PlayerTalkClass->ClearMenus(); switch(action) { case GOSSIP_ACTION_TRAIN: - pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(creature->GetGUID()); break; case GOSSIP_ACTION_TRADE: - pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(creature->GetGUID()); break; } return true; @@ -555,7 +555,7 @@ public: struct npc_brunnhildar_prisonerAI : public ScriptedAI { - npc_brunnhildar_prisonerAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_brunnhildar_prisonerAI(Creature* creature) : ScriptedAI(creature) {} Unit* drake; uint16 enter_timer; diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 0382f30e04f..71b9c0321ab 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -40,7 +40,7 @@ public: struct npc_drakuru_shacklesAI : public ScriptedAI { - npc_drakuru_shacklesAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_drakuru_shacklesAI(Creature* creature) : ScriptedAI(creature) {} uint64 RageclawGUID; @@ -131,7 +131,7 @@ public: struct npc_captured_rageclawAI : public ScriptedAI { - npc_captured_rageclawAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_captured_rageclawAI(Creature* creature) : ScriptedAI(creature) {} uint32 DespawnTimer; bool Despawn; @@ -207,23 +207,23 @@ class npc_gymer : public CreatureScript public: npc_gymer() : CreatureScript("npc_gymer") { } - 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->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_STORM_KING_VENGEANCE) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_G, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(13640, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(13640, 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) @@ -332,7 +332,7 @@ public: struct npc_gurgthockAI : public ScriptedAI { - npc_gurgthockAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_gurgthockAI(Creature* creature) : ScriptedAI(creature) {} uint64 SummonGUID; uint64 uiPlayerGUID; @@ -495,8 +495,8 @@ public: uiPhase = 0; break; case 11: - if (Creature* pCreature = me->SummonCreature(NPC_STINKBEARD, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) - DoScriptText(SAY_STINKBEARD_SPAWN, pCreature); + if (Creature* creature = me->SummonCreature(NPC_STINKBEARD, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + DoScriptText(SAY_STINKBEARD_SPAWN, creature); uiPhase = 0; break; case 12: @@ -517,8 +517,8 @@ public: break; case 14: uiBossRandom = urand(0, 3); - if (Creature* pCreature = me->SummonCreature(Boss[uiBossRandom].uiBoss, SpawnPosition[2], TEMPSUMMON_CORPSE_DESPAWN, 1000)) - pCreature->AI()->SetData(1, uiBossRandom); + if (Creature* creature = me->SummonCreature(Boss[uiBossRandom].uiBoss, SpawnPosition[2], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + creature->AI()->SetData(1, uiBossRandom); uiPhase = 0; break; } @@ -527,29 +527,29 @@ public: } }; - bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) { switch (pQuest->GetQuestId()) { case QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON: - pCreature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, pQuest->GetQuestId()); break; case QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER: - pCreature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, pQuest->GetQuestId()); break; case QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_2: case QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_1: - pCreature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, pQuest->GetQuestId()); break; case QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR: - pCreature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, pQuest->GetQuestId()); break; case QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND: - pCreature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, pQuest->GetQuestId()); break; } - pCreature->AI()->SetGUID(pPlayer->GetGUID()); + creature->AI()->SetGUID(pPlayer->GetGUID()); return false; } @@ -584,7 +584,7 @@ public: struct npc_orinoko_tuskbreakerAI : public ScriptedAI { - npc_orinoko_tuskbreakerAI(Creature* pCreature) : ScriptedAI(pCreature) + npc_orinoko_tuskbreakerAI(Creature* creature) : ScriptedAI(creature) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_PASSIVE); @@ -721,7 +721,7 @@ public: struct npc_korrak_bloodragerAI : public npc_escortAI { - npc_korrak_bloodragerAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_korrak_bloodragerAI(Creature* creature) : npc_escortAI(creature) { Start(true, true, 0, NULL); SetDespawnAtEnd(false); @@ -818,7 +818,7 @@ public: struct npc_yggdrasAI : public ScriptedAI { - npc_yggdrasAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_yggdrasAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiCleaveTimer; uint32 uiCorrodeFleshTimer; @@ -912,7 +912,7 @@ public: struct npc_stinkbeardAI : public npc_escortAI { - npc_stinkbeardAI(Creature* pCreature) : npc_escortAI(pCreature) + npc_stinkbeardAI(Creature* creature) : npc_escortAI(creature) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_PASSIVE); @@ -1036,7 +1036,7 @@ public: struct npc_elemental_lordAI : public ScriptedAI { - npc_elemental_lordAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_elemental_lordAI(Creature* creature) : ScriptedAI(creature) {} std::list<uint64> SummonList; @@ -1181,7 +1181,7 @@ public: struct npc_fiend_elementalAI : public ScriptedAI { - npc_fiend_elementalAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_fiend_elementalAI(Creature* creature) : ScriptedAI(creature) {} uint32 uiMissleTimer; uint32 uiSpell; @@ -1246,7 +1246,7 @@ public: struct npc_released_offspring_harkoaAI : public ScriptedAI { - npc_released_offspring_harkoaAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_released_offspring_harkoaAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { @@ -1295,7 +1295,7 @@ public: struct npc_crusade_recruitAI : public ScriptedAI { - npc_crusade_recruitAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_crusade_recruitAI(Creature* creature) : ScriptedAI(creature) {} uint8 m_uiPhase; //The current phase we are in uint32 m_uiTimer; //Timer until phase transition @@ -1356,25 +1356,25 @@ public: return new npc_crusade_recruitAI(creature); } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* creature) { if (pPlayer->GetQuestStatus(QUEST_TROLL_PATROL_INTESTINAL_FORTITUDE) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_CRUSADE_TEXT, pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_CRUSADE_TEXT, creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF +1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer, SPELL_QUEST_CREDIT, true); - CAST_AI(npc_crusade_recruit::npc_crusade_recruitAI, (pCreature->AI()))->m_uiPhase = 1; - pCreature->SetInFront(pPlayer); - pCreature->SendMovementFlagUpdate(); + creature->CastSpell(pPlayer, SPELL_QUEST_CREDIT, true); + CAST_AI(npc_crusade_recruit::npc_crusade_recruitAI, (creature->AI()))->m_uiPhase = 1; + creature->SetInFront(pPlayer); + creature->SendMovementFlagUpdate(); } return true; |