diff options
| author | Kudlaty <none@none> | 2009-08-14 00:39:07 +0200 |
|---|---|---|
| committer | Kudlaty <none@none> | 2009-08-14 00:39:07 +0200 |
| commit | 764f4b18155d0812105bc66b38918075eb3ada61 (patch) | |
| tree | 5dc9f49613f44afa6f379c112ac3775688fb401f /src | |
| parent | ad4397b40d820cc30fe83acf982aa30d7278813e (diff) | |
More SD2 code style
--HG--
branch : trunk
Diffstat (limited to 'src')
352 files changed, 3079 insertions, 3079 deletions
diff --git a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp index 8bd8e0e13db..5814c58773d 100644 --- a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp @@ -141,9 +141,9 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_emeriss(Creature *_Creature) +CreatureAI* GetAI_boss_emeriss(Creature* pCreature) { - return new boss_emerissAI (_Creature); + return new boss_emerissAI (pCreature); } void AddSC_boss_emeriss() diff --git a/src/bindings/scripts/scripts/boss/boss_taerar.cpp b/src/bindings/scripts/scripts/boss/boss_taerar.cpp index a45390b134d..11baa975e0c 100644 --- a/src/bindings/scripts/scripts/boss/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/boss/boss_taerar.cpp @@ -283,14 +283,14 @@ struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_taerar(Creature *_Creature) +CreatureAI* GetAI_boss_taerar(Creature* pCreature) { - return new boss_taerarAI (_Creature); + return new boss_taerarAI (pCreature); } -CreatureAI* GetAI_boss_shadeoftaerar(Creature *_Creature) +CreatureAI* GetAI_boss_shadeoftaerar(Creature* pCreature) { - return new boss_shadeoftaerarAI (_Creature); + return new boss_shadeoftaerarAI (pCreature); } void AddSC_boss_taerar() diff --git a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp index 32c382ba7f5..83081e05805 100644 --- a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp @@ -223,14 +223,14 @@ struct TRINITY_DLL_DECL mob_dementeddruidsAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_ysondre(Creature *_Creature) +CreatureAI* GetAI_boss_ysondre(Creature* pCreature) { - return new boss_ysondreAI (_Creature); + return new boss_ysondreAI (pCreature); } -CreatureAI* GetAI_mob_dementeddruids(Creature *_Creature) +CreatureAI* GetAI_mob_dementeddruids(Creature* pCreature) { - return new mob_dementeddruidsAI (_Creature); + return new mob_dementeddruidsAI (pCreature); } void AddSC_boss_ysondre() diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp index 1a990108b78..30a57e56dd5 100644 --- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp @@ -157,9 +157,9 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI } }; -CreatureAI* GetAI_generic_creature(Creature *_Creature) +CreatureAI* GetAI_generic_creature(Creature* pCreature) { - return new generic_creatureAI (_Creature); + return new generic_creatureAI (pCreature); } struct TRINITY_DLL_DECL trigger_periodicAI : public NullCreatureAI @@ -219,19 +219,19 @@ struct TRINITY_DLL_DECL mob_webwrapAI : public NullCreatureAI } }; -CreatureAI* GetAI_trigger_periodic(Creature *_Creature) +CreatureAI* GetAI_trigger_periodic(Creature* pCreature) { - return new trigger_periodicAI (_Creature); + return new trigger_periodicAI (pCreature); } -CreatureAI* GetAI_trigger_death(Creature *_Creature) +CreatureAI* GetAI_trigger_death(Creature* pCreature) { - return new trigger_deathAI (_Creature); + return new trigger_deathAI (pCreature); } -CreatureAI* GetAI_mob_webwrap(Creature* _Creature) +CreatureAI* GetAI_mob_webwrap(Creature* pCreature) { - return new mob_webwrapAI (_Creature); + return new mob_webwrapAI (pCreature); } void AddSC_generic_creature() diff --git a/src/bindings/scripts/scripts/custom/custom_example.cpp b/src/bindings/scripts/scripts/custom/custom_example.cpp index 8d232f13099..7a60ab7ef7e 100644 --- a/src/bindings/scripts/scripts/custom/custom_example.cpp +++ b/src/bindings/scripts/scripts/custom/custom_example.cpp @@ -210,45 +210,45 @@ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI //This is the GetAI method used by all scripts that involve AI //It is called every time a new creature using this script is created -CreatureAI* GetAI_custom_example(Creature *_Creature) +CreatureAI* GetAI_custom_example(Creature* pCreature) { - return new custom_exampleAI (_Creature); + return new custom_exampleAI (pCreature); } //This function is called when the player clicks an option on the gossip menu -void SendDefaultMenu_custom_example(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_custom_example(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { //Set our faction to hostile twoards all - _Creature->setFaction(24); - _Creature->Attack(pPlayer, true); + pCreature->setFaction(24); + pCreature->Attack(pPlayer, true); pPlayer->PlayerTalkClass->CloseGossip(); } } //This function is called when the player clicks an option on the gossip menu -bool GossipSelect_custom_example(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_custom_example(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (sender == GOSSIP_SENDER_MAIN) - SendDefaultMenu_custom_example(pPlayer, _Creature, action); + SendDefaultMenu_custom_example(pPlayer, pCreature, action); return true; } //This function is called when the player opens the gossip menu -bool GossipHello_custom_example(Player* pPlayer, Creature *_Creature) +bool GossipHello_custom_example(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(907, pCreature->GetGUID()); return true; } //Our Recive emote function -bool ReceiveEmote_custom_example(Player* pPlayer, Creature *_Creature, uint32 emote) +bool ReceiveEmote_custom_example(Player* pPlayer, Creature* pCreature, uint32 emote) { - _Creature->HandleEmoteCommand(emote); + pCreature->HandleEmoteCommand(emote); if (emote == TEXTEMOTE_DANCE) ((custom_exampleAI*)_Creature->AI())->DoSay(SAY_DANCE,LANG_UNIVERSAL,NULL); diff --git a/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp index 1e726566984..3b7b2bd1a2c 100644 --- a/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp +++ b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp @@ -25,27 +25,27 @@ EndScriptData */ #include <cstring> //This function is called when the player opens the gossip menubool -bool GossipHello_custom_gossip_codebox(Player* pPlayer, Creature *_Creature) +bool GossipHello_custom_gossip_codebox(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(907, pCreature->GetGUID()); return true; } //This function is called when the player clicks an option on the gossip menubool -bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+2) { - _Creature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0); + pCreature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0); pPlayer->CLOSE_GOSSIP_MENU(); } return true; } -bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action, const char* sCode) +bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* sCode) { if (sender == GOSSIP_SENDER_MAIN) { @@ -53,13 +53,13 @@ bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature *_Crea { if (std::strcmp(sCode, pPlayer->GetName())!=0) { - _Creature->Say("Wrong!", LANG_UNIVERSAL, 0); - _Creature->CastSpell(pPlayer, 12826, true); + pCreature->Say("Wrong!", LANG_UNIVERSAL, 0); + pCreature->CastSpell(pPlayer, 12826, true); } else { - _Creature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0); - _Creature->CastSpell(pPlayer, 26990, true); + pCreature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0); + pCreature->CastSpell(pPlayer, 26990, true); } pPlayer->CLOSE_GOSSIP_MENU(); return true; diff --git a/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp b/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp index 395c7b8cb0c..96503aafff8 100644 --- a/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp +++ b/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp @@ -3,16 +3,16 @@ #define GOSSIP_FLIGHT "I need a ride" -bool GossipHello_npc_acherus_taxi(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_acherus_taxi(Player* pPlayer, Creature* pCreature) { pPlayer->SetTaxiCheater(true); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9978,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9978, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_acherus_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_acherus_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { diff --git a/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp b/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp index 5774bbb3df5..eec112ca2e1 100644 --- a/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp +++ b/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp @@ -8,18 +8,18 @@ #define GOSSIP_BOTTOM "Yes, Please. I would like to return to the ground floor of the temple." #define GOSSIP_ONEDOWN "I would like to see Lord Afrasastrasz, in the middle of the temple." -bool GossipHello_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCreature) { pPlayer->SetTaxiCheater(true); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(12887,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12887, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { @@ -35,20 +35,20 @@ bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Cre return true; } -bool GossipHello_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature) { pPlayer->SetTaxiCheater(true); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TOP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(12713,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12713, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 4) { @@ -64,18 +64,18 @@ bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Cre return true; } -bool GossipHello_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature* pCreature) { pPlayer->SetTaxiCheater(true); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOTTOM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ONEDOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(12714,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12714, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 5) { diff --git a/src/bindings/scripts/scripts/custom/test.cpp b/src/bindings/scripts/scripts/custom/test.cpp index 97395cfd9d8..3156bf47911 100644 --- a/src/bindings/scripts/scripts/custom/test.cpp +++ b/src/bindings/scripts/scripts/custom/test.cpp @@ -134,9 +134,9 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI } }; -CreatureAI* GetAI_test(Creature *_Creature) +CreatureAI* GetAI_test(Creature* pCreature) { - npc_testAI* testAI = new npc_testAI(_Creature); + npc_testAI* testAI = new npc_testAI(pCreature); testAI->AddWaypoint(0, 1231, -4419, 23); testAI->AddWaypoint(1, 1198, -4440, 23, 0); @@ -147,25 +147,25 @@ CreatureAI* GetAI_test(Creature *_Creature) return (CreatureAI*)testAI; } -bool GossipHello_npc_test(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_test(Player* pPlayer, Creature* pCreature) { - pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID()); - _Creature->prepareGossipMenu(pPlayer,0); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); + pCreature->prepareGossipMenu(pPlayer,0); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - _Creature->sendPreparedGossip(pPlayer); + pCreature->sendPreparedGossip(pPlayer); return true; } -bool GossipSelect_npc_test(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_test(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - ((npc_escortAI*)(_Creature->AI()))->Start(true, true, pPlayer->GetGUID()); + ((npc_escortAI*)(pCreature->AI()))->Start(true, true, pPlayer->GetGUID()); return true; // prevent Trinity core handling } @@ -173,7 +173,7 @@ bool GossipSelect_npc_test(Player* pPlayer, Creature *_Creature, uint32 sender, if (action == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); - ((npc_escortAI*)(_Creature->AI()))->Start(false, false, pPlayer->GetGUID()); + ((npc_escortAI*)(pCreature->AI()))->Start(false, false, pPlayer->GetGUID()); return true; // prevent Trinity core handling } @@ -181,7 +181,7 @@ bool GossipSelect_npc_test(Player* pPlayer, Creature *_Creature, uint32 sender, if (action == GOSSIP_ACTION_INFO_DEF+3) { pPlayer->CLOSE_GOSSIP_MENU(); - ((npc_escortAI*)(_Creature->AI()))->Start(false, false, pPlayer->GetGUID()); + ((npc_escortAI*)(pCreature->AI()))->Start(false, false, pPlayer->GetGUID()); return true; // prevent Trinity core handling } diff --git a/src/bindings/scripts/scripts/examples/example_creature.cpp b/src/bindings/scripts/scripts/examples/example_creature.cpp index ae847b627a5..724eb3478cc 100644 --- a/src/bindings/scripts/scripts/examples/example_creature.cpp +++ b/src/bindings/scripts/scripts/examples/example_creature.cpp @@ -206,37 +206,37 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI //This is the GetAI method used by all scripts that involve AI //It is called every time a new creature using this script is created -CreatureAI* GetAI_example_creature(Creature *_Creature) +CreatureAI* GetAI_example_creature(Creature* pCreature) { - return new example_creatureAI (_Creature); + return new example_creatureAI (pCreature); } //This function is called when the player clicks an option on the gossip menu -void SendDefaultMenu_example_creature(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_example_creature(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { //Set our faction to hostile twoards all - _Creature->setFaction(24); - _Creature->Attack(pPlayer, true); + pCreature->setFaction(24); + pCreature->Attack(pPlayer, true); pPlayer->PlayerTalkClass->CloseGossip(); } } //This function is called when the player clicks an option on the gossip menu -bool GossipSelect_example_creature(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_example_creature(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (sender == GOSSIP_SENDER_MAIN) - SendDefaultMenu_example_creature(pPlayer, _Creature, action); + SendDefaultMenu_example_creature(pPlayer, pCreature, action); return true; } //This function is called when the player opens the gossip menu -bool GossipHello_example_creature(Player* pPlayer, Creature *_Creature) +bool GossipHello_example_creature(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(907, pCreature->GetGUID()); return true; } diff --git a/src/bindings/scripts/scripts/examples/example_escort.cpp b/src/bindings/scripts/scripts/examples/example_escort.cpp index 67a892c9d58..55fdb278293 100644 --- a/src/bindings/scripts/scripts/examples/example_escort.cpp +++ b/src/bindings/scripts/scripts/examples/example_escort.cpp @@ -155,9 +155,9 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI } }; -CreatureAI* GetAI_example_escort(Creature *_Creature) +CreatureAI* GetAI_example_escort(Creature* pCreature) { - example_escortAI* testAI = new example_escortAI(_Creature); + example_escortAI* testAI = new example_escortAI(pCreature); testAI->AddWaypoint(0, 1231, -4419, 23); testAI->AddWaypoint(1, 1198, -4440, 23, 0); @@ -168,25 +168,25 @@ CreatureAI* GetAI_example_escort(Creature *_Creature) return testAI; } -bool GossipHello_example_escort(Player* pPlayer, Creature *_Creature) +bool GossipHello_example_escort(Player* pPlayer, Creature* pCreature) { - pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID()); - _Creature->prepareGossipMenu(pPlayer,0); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); + pCreature->prepareGossipMenu(pPlayer,0); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - _Creature->sendPreparedGossip(pPlayer); + pCreature->sendPreparedGossip(pPlayer); return true; } -bool GossipSelect_example_escort(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_example_escort(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, true, pPlayer->GetGUID()); return true; // prevent mangos core handling } @@ -194,7 +194,7 @@ bool GossipSelect_example_escort(Player* pPlayer, Creature *_Creature, uint32 se if (action == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, false, pPlayer->GetGUID()); return true; // prevent mangos core handling } @@ -202,7 +202,7 @@ bool GossipSelect_example_escort(Player* pPlayer, Creature *_Creature, uint32 se if (action == GOSSIP_ACTION_INFO_DEF+3) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); return true; // prevent mangos core handling } diff --git a/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp b/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp index ed17220f806..105a3c9527e 100644 --- a/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp +++ b/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp @@ -32,27 +32,27 @@ EndScriptData */ #define GOSSIP_ITEM_2 "I'm not interested" //This function is called when the player opens the gossip menubool -bool GossipHello_example_gossip_codebox(Player* pPlayer, Creature *_Creature) +bool GossipHello_example_gossip_codebox(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(907, pCreature->GetGUID()); return true; } //This function is called when the player clicks an option on the gossip menubool -bool GossipSelect_example_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_example_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+2) { - DoScriptText(SAY_NOT_INTERESTED, _Creature); + DoScriptText(SAY_NOT_INTERESTED, pCreature); pPlayer->CLOSE_GOSSIP_MENU(); } return true; } -bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action, const char* sCode) +bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* sCode) { if (sender == GOSSIP_SENDER_MAIN) { @@ -60,13 +60,13 @@ bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature *_Cre { if (std::strcmp(sCode, pPlayer->GetName())!=0) { - DoScriptText(SAY_WRONG, _Creature); - _Creature->CastSpell(pPlayer, 12826, true); + DoScriptText(SAY_WRONG, pCreature); + pCreature->CastSpell(pPlayer, 12826, true); } else { - DoScriptText(SAY_CORRECT, _Creature); - _Creature->CastSpell(pPlayer, 26990, true); + DoScriptText(SAY_CORRECT, pCreature); + pCreature->CastSpell(pPlayer, 26990, true); } pPlayer->CLOSE_GOSSIP_MENU(); return true; diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp index 0c633513f1b..c0c466b0543 100644 --- a/src/bindings/scripts/scripts/guard/guards.cpp +++ b/src/bindings/scripts/scripts/guard/guards.cpp @@ -83,7 +83,7 @@ EndContentData */ * guard_azuremyst start *******************************************************/ -bool GossipHello_guard_azuremyst(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_azuremyst(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -92,33 +92,33 @@ bool GossipHello_guard_azuremyst(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(10066,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10066, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_POI(-3918.95, -11544.7, 7, 6, 0, "Bank"); - pPlayer->SEND_GOSSIP_MENU(10067,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10067, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hippogryph Master pPlayer->SEND_POI(-4057.15, -11788.6, 7, 6, 0, "Stephanos"); - pPlayer->SEND_GOSSIP_MENU(10071,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10071, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Guild master pPlayer->SEND_POI(-4092.43, -11626.6, 7, 6, 0, "Funaam"); - pPlayer->SEND_GOSSIP_MENU(10073,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10073, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->SEND_POI(-4129.43, -12469, 7, 6, 0, "Caregiver Chellan"); - pPlayer->SEND_GOSSIP_MENU(10074,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10074, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Stable Master pPlayer->SEND_POI(-4146.42, -12492.7, 7, 6, 0, "Esbina"); - pPlayer->SEND_GOSSIP_MENU(10075,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10075, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -128,7 +128,7 @@ void SendDefaultMenu_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(10076,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10076, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -144,111 +144,111 @@ void SendDefaultMenu_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(10087,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10087, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(-4274.81, -11495.3, 7, 6, 0, "Shalannius"); - pPlayer->SEND_GOSSIP_MENU(10077,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10077, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter pPlayer->SEND_POI(-4203.65, -12526.5, 7, 6, 0, "Acteon"); - pPlayer->SEND_GOSSIP_MENU(10078,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10078, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Mage pPlayer->SEND_POI(-4149.62, -12530.1, 7, 6, 0, "Semid"); - pPlayer->SEND_GOSSIP_MENU(10081,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10081, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Paladin pPlayer->SEND_POI(-4138.98, -12468.5, 7, 6, 0, "Tullas"); - pPlayer->SEND_GOSSIP_MENU(10083,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10083, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Priest pPlayer->SEND_POI(-4131.66, -12478.6, 7, 6, 0, "Guvan"); - pPlayer->SEND_GOSSIP_MENU(10084,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10084, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Shaman pPlayer->SEND_POI(-4162.33, -12456.1, 7, 6, 0, "Tuluun"); - pPlayer->SEND_GOSSIP_MENU(10085,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10085, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warrior pPlayer->SEND_POI(-4165.05, -12536.4, 7, 6, 0, "Ruada"); - pPlayer->SEND_GOSSIP_MENU(10086,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10086, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-4191.15, -12470, 7, 6, 0, "Daedal"); - pPlayer->SEND_GOSSIP_MENU(10088,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10088, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-4726.29, -12387, 7, 6, 0, "Blacksmith Calypso"); - pPlayer->SEND_GOSSIP_MENU(10089,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10089, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-4710.87, -12400.6, 7, 6, 0, "'Cookie' McWeaksauce"); - pPlayer->SEND_GOSSIP_MENU(10090,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10090, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(-3882.85, -11496.7, 7, 6, 0, "Nahogg"); - pPlayer->SEND_GOSSIP_MENU(10091,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10091, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(-4157.57, -12470.2, 7, 6, 0, "Artificer Daelo"); - pPlayer->SEND_GOSSIP_MENU(10092,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10092, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(-4199.11, -12469.9, 7, 6, 0, "Anchorite Fateema"); - pPlayer->SEND_GOSSIP_MENU(10093,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10093, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(-4266.38, -12985.1, 7, 6, 0, "Diktynna"); - pPlayer->SEND_GOSSIP_MENU(10094,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10094, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism - pPlayer->SEND_GOSSIP_MENU(10095,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10095, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Jewelcrafting pPlayer->SEND_POI(-3781.55, -11541.8, 7, 6, 0, "Farii"); - pPlayer->SEND_GOSSIP_MENU(10096,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10096, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Leatherworking pPlayer->SEND_POI(-3442.68, -12322.2, 7, 6, 0, "Moordo"); - pPlayer->SEND_GOSSIP_MENU(10098,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10098, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Mining pPlayer->SEND_POI(-4179.89, -12493.1, 7, 6, 0, "Dulvi"); - pPlayer->SEND_GOSSIP_MENU(10097,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10097, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Skinning pPlayer->SEND_POI(-3431.17, -12316.5, 7, 6, 0, "Gurf"); - pPlayer->SEND_GOSSIP_MENU(10098,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10098, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: //Tailoring pPlayer->SEND_POI(-4711.54, -12386.7, 7, 6, 0, "Erin Kelly"); - pPlayer->SEND_GOSSIP_MENU(10099,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10099, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_azuremyst(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_azuremyst(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_azuremyst(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_azuremyst(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_azuremyst(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_azuremyst(pPlayer, pCreature, action); break; } return true; } @@ -257,16 +257,16 @@ bool GossipSelect_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 s * guard_azuremyst end *******************************************************/ -CreatureAI* GetAI_guard_azuremyst(Creature *_Creature) +CreatureAI* GetAI_guard_azuremyst(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_bluffwatcher start *******************************************************/ -bool GossipHello_guard_bluffwatcher(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_bluffwatcher(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -279,51 +279,51 @@ bool GossipHello_guard_bluffwatcher(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(3543,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3543, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_POI(-1257.8, 24.14, 7, 6, 0, "Thunder Bluff Bank"); - pPlayer->SEND_GOSSIP_MENU(1292,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1292, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Wind master pPlayer->SEND_POI(-1196.43, 28.26, 7, 6, 0, "Wind Rider Roost"); - pPlayer->SEND_GOSSIP_MENU(1293,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1293, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Guild master pPlayer->SEND_POI(-1296.5, 127.57, 7, 6, 0, "Thunder Bluff Civic Information"); - pPlayer->SEND_GOSSIP_MENU(1291,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1291, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->SEND_POI(-1296, 39.7, 7, 6, 0, "Thunder Bluff Inn"); - pPlayer->SEND_GOSSIP_MENU(3153,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3153, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Mailbox pPlayer->SEND_POI(-1263.59, 44.36, 7, 6, 0, "Thunder Bluff Mailbox"); - pPlayer->SEND_GOSSIP_MENU(3154,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3154, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Auction House pPlayer->SEND_POI(1381.77, -4371.16, 7, 6, 0, GOSSIP_TEXT_AUCTIONHOUSE); - pPlayer->SEND_GOSSIP_MENU(3155,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3155, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Weapon master pPlayer->SEND_POI(-1282.31, 89.56, 7, 6, 0, "Ansekhwa"); - pPlayer->SEND_GOSSIP_MENU(4520,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4520, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Stable master pPlayer->SEND_POI(-1270.19, 48.84, 7, 6, 0, "Bulrug"); - pPlayer->SEND_GOSSIP_MENU(5977,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5977, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(7527,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7527, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -332,7 +332,7 @@ void SendDefaultMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, ui pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(3542,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3542, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -346,120 +346,120 @@ void SendDefaultMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, ui pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(3541,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3541, pCreature->GetGUID()); break; } } -void SendBattleMasterMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(-1387.82, -97.55, 7, 6, 0, "Taim Ragetotem"); - pPlayer->SEND_GOSSIP_MENU(7522,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7522, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //AB pPlayer->SEND_POI(-997, 214.12, 7, 6, 0, "Martin Lindsey"); - pPlayer->SEND_GOSSIP_MENU(7648,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7648, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //WSG pPlayer->SEND_POI(-1384.94, -75.91, 7, 6, 0, "Kergul Bloodaxe"); - pPlayer->SEND_GOSSIP_MENU(7523,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7523, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(-1054.47, -285, 7, 6, 0, "Hall of Elders"); - pPlayer->SEND_GOSSIP_MENU(1294,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1294, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter pPlayer->SEND_POI(-1416.32, -114.28, 7, 6, 0, "Hunter's Hall"); - pPlayer->SEND_GOSSIP_MENU(1295,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1295, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Mage pPlayer->SEND_POI(-1061.2, 195.5, 7, 6, 0, "Pools of Vision"); - pPlayer->SEND_GOSSIP_MENU(1296,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1296, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Priest pPlayer->SEND_POI(-1061.2, 195.5, 7, 6, 0, "Pools of Vision"); - pPlayer->SEND_GOSSIP_MENU(1297,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1297, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Shaman pPlayer->SEND_POI(-989.54, 278.25, 7, 6, 0, "Hall of Spirits"); - pPlayer->SEND_GOSSIP_MENU(1298,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1298, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Warrior pPlayer->SEND_POI(-1416.32, -114.28, 7, 6, 0, "Hunter's Hall"); - pPlayer->SEND_GOSSIP_MENU(1299,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1299, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-1085.56, 27.29, 7, 6, 0, "Bena's Alchemy"); - pPlayer->SEND_GOSSIP_MENU(1332,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1332, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-1239.75, 104.88, 7, 6, 0, "Karn's Smithy"); - pPlayer->SEND_GOSSIP_MENU(1333,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1333, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-1214.5, -21.23, 7, 6, 0, "Aska's Kitchen"); - pPlayer->SEND_GOSSIP_MENU(1334,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1334, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(-1112.65, 48.26, 7, 6, 0, "Dawnstrider Enchanters"); - pPlayer->SEND_GOSSIP_MENU(1335,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1335, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //First Aid pPlayer->SEND_POI(-996.58, 200.5, 7, 6, 0, "Spiritual Healing"); - pPlayer->SEND_GOSSIP_MENU(1336,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1336, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Fishing pPlayer->SEND_POI(-1169.35, -68.87, 7, 6, 0, "Mountaintop Bait & Tackle"); - pPlayer->SEND_GOSSIP_MENU(1337,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1337, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Herbalism pPlayer->SEND_POI(-1137.7, -1.51, 7, 6, 0, "Holistic Herbalism"); - pPlayer->SEND_GOSSIP_MENU(1338,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1338, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Leatherworking pPlayer->SEND_POI(-1156.22, 66.86, 7, 6, 0, "Thunder Bluff Armorers"); - pPlayer->SEND_GOSSIP_MENU(1339,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1339, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Mining pPlayer->SEND_POI(-1249.17, 155, 7, 6, 0, "Stonehoof Geology"); - pPlayer->SEND_GOSSIP_MENU(1340,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1340, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Skinning pPlayer->SEND_POI(-1148.56, 51.18, 7, 6, 0, "Mooranta"); - pPlayer->SEND_GOSSIP_MENU(1343,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1343, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Tailoring pPlayer->SEND_POI(-1156.22, 66.86, 7, 6, 0, "Thunder Bluff Armorers"); - pPlayer->SEND_GOSSIP_MENU(1341,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1341, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_bluffwatcher(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_bluffwatcher(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_bluffwatcher(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_bluffwatcher(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_bluffwatcher(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_bluffwatcher(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_bluffwatcher(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_bluffwatcher(pPlayer, pCreature, action); break; } return true; } @@ -468,18 +468,18 @@ bool GossipSelect_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint3 * guard_bluffwatcher end *******************************************************/ -CreatureAI* GetAI_guard_bluffwatcher(Creature *_Creature) +CreatureAI* GetAI_guard_bluffwatcher(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_contested start *******************************************************/ -CreatureAI* GetAI_guard_contested(Creature *_Creature) +CreatureAI* GetAI_guard_contested(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_contested end @@ -489,7 +489,7 @@ CreatureAI* GetAI_guard_contested(Creature *_Creature) * guard_darnassus start *******************************************************/ -bool GossipHello_guard_darnassus(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_darnassus(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -502,51 +502,51 @@ bool GossipHello_guard_darnassus(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(3016, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3016, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction house pPlayer->SEND_POI(9861.23, 2334.55, 7, 6, 0, "Darnassus Auction House"); - pPlayer->SEND_GOSSIP_MENU(3833, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3833, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bank pPlayer->SEND_POI(9938.45, 2512.35, 7, 6, 0, "Darnassus Bank"); - pPlayer->SEND_GOSSIP_MENU(3017, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3017, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Wind master pPlayer->SEND_POI(9945.65, 2618.94, 7, 6, 0, "Rut'theran Village"); - pPlayer->SEND_GOSSIP_MENU(3018, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3018, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Guild master pPlayer->SEND_POI(10076.40, 2199.59, 7, 6, 0, "Darnassus Guild Master"); - pPlayer->SEND_GOSSIP_MENU(3019, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3019, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Inn pPlayer->SEND_POI(10133.29, 2222.52, 7, 6, 0, "Darnassus Inn"); - pPlayer->SEND_GOSSIP_MENU(3020, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3020, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Mailbox pPlayer->SEND_POI(9942.17, 2495.48, 7, 6, 0, "Darnassus Mailbox"); - pPlayer->SEND_GOSSIP_MENU(3021, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3021, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Stable master pPlayer->SEND_POI(10167.20, 2522.66, 7, 6, 0, "Alassin"); - pPlayer->SEND_GOSSIP_MENU(5980, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5980, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Weapon trainer pPlayer->SEND_POI(9907.11, 2329.70, 7, 6, 0, "Ilyenia Moonfire"); - pPlayer->SEND_GOSSIP_MENU(4517, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4517, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(7519, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7519, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -554,7 +554,7 @@ void SendDefaultMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(4264, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4264, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -566,108 +566,108 @@ void SendDefaultMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9); - pPlayer->SEND_GOSSIP_MENU(4273, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4273, pCreature->GetGUID()); break; } } -void SendBattleMasterMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(9923.61, 2327.43, 7, 6, 0, "Brogun Stoneshield"); - pPlayer->SEND_GOSSIP_MENU(7518, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7518, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //AB pPlayer->SEND_POI(9977.37, 2324.39, 7, 6, 0, "Keras Wolfheart"); - pPlayer->SEND_GOSSIP_MENU(7651, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7651, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //WSG pPlayer->SEND_POI(9979.84, 2315.79, 7, 6, 0, "Aethalas"); - pPlayer->SEND_GOSSIP_MENU(7482, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7482, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(10186, 2570.46, 7, 6, 0, "Darnassus Druid Trainer"); - pPlayer->SEND_GOSSIP_MENU(3024, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3024, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter pPlayer->SEND_POI(10177.29, 2511.10, 7, 6, 0, "Darnassus Hunter Trainer"); - pPlayer->SEND_GOSSIP_MENU(3023, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3023, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Priest pPlayer->SEND_POI(9659.12, 2524.88, 7, 6, 0, "Temple of the Moon"); - pPlayer->SEND_GOSSIP_MENU(3025, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3025, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Rogue pPlayer->SEND_POI(10122, 2599.12, 7, 6, 0, "Darnassus Rogue Trainer"); - pPlayer->SEND_GOSSIP_MENU(3026, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3026, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Warrior pPlayer->SEND_POI(9951.91, 2280.38, 7, 6, 0, "Warrior's Terrace"); - pPlayer->SEND_GOSSIP_MENU(3033, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3033, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(10075.90, 2356.76, 7, 6, 0, "Darnassus Alchemy Trainer"); - pPlayer->SEND_GOSSIP_MENU(3035, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3035, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Cooking pPlayer->SEND_POI(10088.59, 2419.21, 7, 6, 0, "Darnassus Cooking Trainer"); - pPlayer->SEND_GOSSIP_MENU(3036, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3036, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Enchanting pPlayer->SEND_POI(10146.09, 2313.42, 7, 6, 0, "Darnassus Enchanting Trainer"); - pPlayer->SEND_GOSSIP_MENU(3337, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3337, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //First Aid pPlayer->SEND_POI(10150.09, 2390.43, 7, 6, 0, "Darnassus First Aid Trainer"); - pPlayer->SEND_GOSSIP_MENU(3037, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3037, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Fishing pPlayer->SEND_POI(9836.20, 2432.17, 7, 6, 0, "Darnassus Fishing Trainer"); - pPlayer->SEND_GOSSIP_MENU(3038, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3038, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Herbalism pPlayer->SEND_POI(9757.17, 2430.16, 7, 6, 0, "Darnassus Herbalism Trainer"); - pPlayer->SEND_GOSSIP_MENU(3039, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3039, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Leatherworking pPlayer->SEND_POI(10086.59, 2255.77, 7, 6, 0, "Darnassus Leatherworking Trainer"); - pPlayer->SEND_GOSSIP_MENU(3040, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3040, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Skinning pPlayer->SEND_POI(10081.40, 2257.18, 7, 6, 0, "Darnassus Skinning Trainer"); - pPlayer->SEND_GOSSIP_MENU(3042, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3042, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Tailoring pPlayer->SEND_POI(10079.70, 2268.19, 7, 6, 0, "Darnassus Tailor"); - pPlayer->SEND_GOSSIP_MENU(3044, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3044, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_darnassus(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_darnassus(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_darnassus(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_darnassus(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_darnassus(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_darnassus(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_darnassus(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_darnassus(pPlayer, pCreature, action); break; } return true; } @@ -676,16 +676,16 @@ bool GossipSelect_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 s * guard_darnassus end *******************************************************/ -CreatureAI* GetAI_guard_darnassus(Creature *_Creature) +CreatureAI* GetAI_guard_darnassus(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_dunmorogh start *******************************************************/ -bool GossipHello_guard_dunmorogh(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_dunmorogh(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -694,31 +694,31 @@ bool GossipHello_guard_dunmorogh(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(4287,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4287, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank - pPlayer->SEND_GOSSIP_MENU(4288,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4288, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Gryphon master - pPlayer->SEND_GOSSIP_MENU(4289,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4289, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Guild master - pPlayer->SEND_GOSSIP_MENU(4290,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4290, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->SEND_POI(-5582.66, -525.89, 7, 6, 0, "Thunderbrew Distillery"); - pPlayer->SEND_GOSSIP_MENU(4291,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4291, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Stable Master pPlayer->SEND_POI(-5604, -509.58, 7, 6, 0, "Shelby Stoneflint"); - pPlayer->SEND_GOSSIP_MENU(5985,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5985, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -728,7 +728,7 @@ void SendDefaultMenu_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(4292,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4292, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -743,102 +743,102 @@ void SendDefaultMenu_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(4300,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4300, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Hunter pPlayer->SEND_POI(-5618.29, -454.25, 7, 6, 0, "Grif Wildheart"); - pPlayer->SEND_GOSSIP_MENU(4293,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4293, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Mage pPlayer->SEND_POI(-5585.6, -539.99, 7, 6, 0, "Magis Sparkmantle"); - pPlayer->SEND_GOSSIP_MENU(4294,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4294, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Paladin pPlayer->SEND_POI(-5585.6, -539.99, 7, 6, 0, "Azar Stronghammer"); - pPlayer->SEND_GOSSIP_MENU(4295,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4295, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Priest pPlayer->SEND_POI(-5591.74, -525.61, 7, 6, 0, "Maxan Anvol"); - pPlayer->SEND_GOSSIP_MENU(4296,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4296, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Rogue pPlayer->SEND_POI(-5602.75, -542.4, 7, 6, 0, "Hogral Bakkan"); - pPlayer->SEND_GOSSIP_MENU(4297,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4297, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Warlock pPlayer->SEND_POI(-5641.97, -523.76, 7, 6, 0, "Gimrizz Shadowcog"); - pPlayer->SEND_GOSSIP_MENU(4298,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4298, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warrior pPlayer->SEND_POI(-5604.79, -529.38, 7, 6, 0, "Granis Swiftaxe"); - pPlayer->SEND_GOSSIP_MENU(4299,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4299, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy - pPlayer->SEND_GOSSIP_MENU(4301,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4301, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-5584.72, -428.41, 7, 6, 0, "Tognus Flintfire"); - pPlayer->SEND_GOSSIP_MENU(4302,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4302, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-5596.85, -541.43, 7, 6, 0, "Gremlock Pilsnor"); - pPlayer->SEND_GOSSIP_MENU(4303,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4303, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting - pPlayer->SEND_GOSSIP_MENU(4304,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4304, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(-5531, -666.53, 7, 6, 0, "Bronk Guzzlegear"); - pPlayer->SEND_GOSSIP_MENU(4305,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4305, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(-5603.67, -523.57, 7, 6, 0, "Thamner Pol"); - pPlayer->SEND_GOSSIP_MENU(4306,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4306, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(-5199.9, 58.58, 7, 6, 0, "Paxton Ganter"); - pPlayer->SEND_GOSSIP_MENU(4307,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4307, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism - pPlayer->SEND_GOSSIP_MENU(4308,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4308, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking - pPlayer->SEND_GOSSIP_MENU(4310,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4310, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Mining pPlayer->SEND_POI(-5531, -666.53, 7, 6, 0, "Yarr Hamerstone"); - pPlayer->SEND_GOSSIP_MENU(4311,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4311, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning - pPlayer->SEND_GOSSIP_MENU(4312,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4312, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring - pPlayer->SEND_GOSSIP_MENU(4313,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4313, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_dunmorogh(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_dunmorogh(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_dunmorogh(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_dunmorogh(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_dunmorogh(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_dunmorogh(pPlayer, pCreature, action); break; } return true; } @@ -847,16 +847,16 @@ bool GossipSelect_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 s * guard_dunmorogh end *******************************************************/ -CreatureAI* GetAI_guard_dunmorogh(Creature *_Creature) +CreatureAI* GetAI_guard_dunmorogh(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_durotar start *******************************************************/ -bool GossipHello_guard_durotar(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_durotar(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -864,27 +864,27 @@ bool GossipHello_guard_durotar(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(4037,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4037, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank - pPlayer->SEND_GOSSIP_MENU(4032,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4032, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Wind rider - pPlayer->SEND_GOSSIP_MENU(4033,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4033, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Inn pPlayer->SEND_POI(338.7, -4688.87, 7, 6, 0, "Razor Hill Inn"); - pPlayer->SEND_GOSSIP_MENU(4034,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4034, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Stable master pPlayer->SEND_POI(330.31, -4710.66, 7, 6, 0, "Shoja'my"); - pPlayer->SEND_GOSSIP_MENU(5973,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5973, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -894,7 +894,7 @@ void SendDefaultMenu_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(4035,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4035, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -909,103 +909,103 @@ void SendDefaultMenu_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(4036,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4036, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Hunter pPlayer->SEND_POI(276, -4706.72, 7, 6, 0, "Thotar"); - pPlayer->SEND_GOSSIP_MENU(4013,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4013, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Mage pPlayer->SEND_POI(-839.33, -4935.6, 7, 6, 0, "Un'Thuwa"); - pPlayer->SEND_GOSSIP_MENU(4014,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4014, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Priest pPlayer->SEND_POI(296.22, -4828.1, 7, 6, 0, "Tai'jin"); - pPlayer->SEND_GOSSIP_MENU(4015,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4015, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Rogue pPlayer->SEND_POI(265.76, -4709, 7, 6, 0, "Kaplak"); - pPlayer->SEND_GOSSIP_MENU(4016,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4016, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Shaman pPlayer->SEND_POI(307.79, -4836.97, 7, 6, 0, "Swart"); - pPlayer->SEND_GOSSIP_MENU(4017,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4017, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Warlock pPlayer->SEND_POI(355.88, -4836.45, 7, 6, 0, "Dhugru Gorelust"); - pPlayer->SEND_GOSSIP_MENU(4018,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4018, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warrior pPlayer->SEND_POI(312.3, -4824.66, 7, 6, 0, "Tarshaw Jaggedscar"); - pPlayer->SEND_GOSSIP_MENU(4019,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4019, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-800.25, -4894.33, 7, 6, 0, "Miao'zan"); - pPlayer->SEND_GOSSIP_MENU(4020,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4020, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(373.24, -4716.45, 7, 6, 0, "Dwukk"); - pPlayer->SEND_GOSSIP_MENU(4021,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4021, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking - pPlayer->SEND_GOSSIP_MENU(4022,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4022, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting - pPlayer->SEND_GOSSIP_MENU(4023,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4023, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(368.95, -4723.95, 7, 6, 0, "Mukdrak"); - pPlayer->SEND_GOSSIP_MENU(4024,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4024, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(327.17, -4825.62, 7, 6, 0, "Rawrk"); - pPlayer->SEND_GOSSIP_MENU(4025,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4025, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(-1065.48, -4777.43, 7, 6, 0, "Lau'Tiki"); - pPlayer->SEND_GOSSIP_MENU(4026,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4026, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism pPlayer->SEND_POI(-836.25, -4896.89, 7, 6, 0, "Mishiki"); - pPlayer->SEND_GOSSIP_MENU(4027,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4027, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking - pPlayer->SEND_GOSSIP_MENU(4028,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4028, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Mining pPlayer->SEND_POI(366.94, -4705, 7, 6, 0, "Krunn"); - pPlayer->SEND_GOSSIP_MENU(4029,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4029, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning - pPlayer->SEND_GOSSIP_MENU(4030,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4030, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring - pPlayer->SEND_GOSSIP_MENU(4031,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4031, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_durotar(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_durotar(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_durotar(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_durotar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_durotar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_durotar(pPlayer, pCreature, action); break; } return true; } @@ -1014,16 +1014,16 @@ bool GossipSelect_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 sen * guard_durotar end *******************************************************/ -CreatureAI* GetAI_guard_durotar(Creature *_Creature) +CreatureAI* GetAI_guard_durotar(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_elwynnforest start *******************************************************/ -bool GossipHello_guard_elwynnforest(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_elwynnforest(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GRYPHON , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1032,30 +1032,30 @@ bool GossipHello_guard_elwynnforest(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(933,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(933, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank - pPlayer->SEND_GOSSIP_MENU(4260,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4260, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Gryphon master - pPlayer->SEND_GOSSIP_MENU(4261,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4261, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Guild master - pPlayer->SEND_GOSSIP_MENU(4262,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4262, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->SEND_POI(-9459.34, 42.08, 7, 6, 0, "Lion's Pride Inn"); - pPlayer->SEND_GOSSIP_MENU(4263,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4263, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Stable Master pPlayer->SEND_POI(-9466.62, 45.87, 7, 6, 0, "Erma"); - pPlayer->SEND_GOSSIP_MENU(5983,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5983, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1066,7 +1066,7 @@ void SendDefaultMenu_guard_elwynnforest(Player* pPlayer, Creature *_Creature, ui pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8); - pPlayer->SEND_GOSSIP_MENU(4264,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4264, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1081,107 +1081,107 @@ void SendDefaultMenu_guard_elwynnforest(Player* pPlayer, Creature *_Creature, ui pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(4273,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4273, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid - pPlayer->SEND_GOSSIP_MENU(4265,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4265, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter - pPlayer->SEND_GOSSIP_MENU(4266,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4266, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Mage pPlayer->SEND_POI(-9471.12, 33.44, 7, 6, 0, "Zaldimar Wefhellt"); - pPlayer->SEND_GOSSIP_MENU(4268,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4268, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Paladin pPlayer->SEND_POI(-9469, 108.05, 7, 6, 0, "Brother Wilhelm"); - pPlayer->SEND_GOSSIP_MENU(4269,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4269, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Priest pPlayer->SEND_POI(-9461.07, 32.6, 7, 6, 0, "Priestess Josetta"); - pPlayer->SEND_GOSSIP_MENU(4267,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4267, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Rogue pPlayer->SEND_POI(-9465.13, 13.29, 7, 6, 0, "Keryn Sylvius"); - pPlayer->SEND_GOSSIP_MENU(4270,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4270, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warlock pPlayer->SEND_POI(-9473.21, -4.08, 7, 6, 0, "Maximillian Crowe"); - pPlayer->SEND_GOSSIP_MENU(4272,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4272, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Warrior pPlayer->SEND_POI(-9461.82, 109.50, 7, 6, 0, "Lyria Du Lac"); - pPlayer->SEND_GOSSIP_MENU(4271,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4271, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-9057.04, 153.63, 7, 6, 0, "Alchemist Mallory"); - pPlayer->SEND_GOSSIP_MENU(4274,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4274, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-9456.58, 87.90, 7, 6, 0, "Smith Argus"); - pPlayer->SEND_GOSSIP_MENU(4275,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4275, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-9467.54, -3.16, 7, 6, 0, "Tomas"); - pPlayer->SEND_GOSSIP_MENU(4276,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4276, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting - pPlayer->SEND_GOSSIP_MENU(4277,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4277, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering - pPlayer->SEND_GOSSIP_MENU(4278,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4278, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(-9456.82, 30.49, 7, 6, 0, "Michelle Belle"); - pPlayer->SEND_GOSSIP_MENU(4279,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4279, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(-9386.54, -118.73, 7, 6, 0, "Lee Brown"); - pPlayer->SEND_GOSSIP_MENU(4280,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4280, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism pPlayer->SEND_POI(-9060.70, 149.23, 7, 6, 0, "Herbalist Pomeroy"); - pPlayer->SEND_GOSSIP_MENU(4281,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4281, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking pPlayer->SEND_POI(-9376.12, -75.23, 7, 6, 0, "Adele Fielder"); - pPlayer->SEND_GOSSIP_MENU(4282,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4282, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Mining - pPlayer->SEND_GOSSIP_MENU(4283,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4283, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning pPlayer->SEND_POI(-9536.91, -1212.76, 7, 6, 0, "Helene Peltskinner"); - pPlayer->SEND_GOSSIP_MENU(4284,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4284, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring pPlayer->SEND_POI(-9376.12, -75.23, 7, 6, 0, "Eldrin"); - pPlayer->SEND_GOSSIP_MENU(4285,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4285, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_elwynnforest(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_elwynnforest(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_elwynnforest(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_elwynnforest(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_elwynnforest(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_elwynnforest(pPlayer, pCreature, action); break; } return true; } @@ -1190,16 +1190,16 @@ bool GossipSelect_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint3 * guard_elwynnforest end *******************************************************/ -CreatureAI* GetAI_guard_elwynnforest(Creature *_Creature) +CreatureAI* GetAI_guard_elwynnforest(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_eversong start *******************************************************/ -bool GossipHello_guard_eversong(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_eversong(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1207,28 +1207,28 @@ bool GossipHello_guard_eversong(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(10180,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10180, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bat Handler pPlayer->SEND_POI(9371.93, -7164.80, 7, 6, 0, "Skymistress Gloaming"); - pPlayer->SEND_GOSSIP_MENU(10181,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10181, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Guild master - pPlayer->SEND_GOSSIP_MENU(10182,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10182, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Inn pPlayer->SEND_POI(9483.74, -6844.58, 7, 6, 0, "Delaniel's inn"); - pPlayer->SEND_GOSSIP_MENU(10183,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10183, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Stable Master pPlayer->SEND_POI(9489.62, -6829.93, 7, 6, 0, "Anathos"); - pPlayer->SEND_GOSSIP_MENU(10184,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10184, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1238,7 +1238,7 @@ void SendDefaultMenu_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(10180,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10180, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1253,104 +1253,104 @@ void SendDefaultMenu_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(10180,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10180, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid - pPlayer->SEND_GOSSIP_MENU(10185,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10185, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter pPlayer->SEND_POI(9527.44, -6865.25, 7, 6, 0, "Hannovia"); - pPlayer->SEND_GOSSIP_MENU(10186,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10186, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Mage pPlayer->SEND_POI(9464.24, -6855.52, 7, 6, 0, "Garridel"); - pPlayer->SEND_GOSSIP_MENU(10187,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10187, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Paladin pPlayer->SEND_POI(9517.61, -6871.04, 7, 6, 0, "Noellene"); - pPlayer->SEND_GOSSIP_MENU(10189,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10189, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Priest pPlayer->SEND_POI(9467.39, -6845.72, 7, 6, 0, "Ponaris"); - pPlayer->SEND_GOSSIP_MENU(10190,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10190, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Rogue pPlayer->SEND_POI(9533.67, -6877.39, 7, 6, 0, "Tannaria"); - pPlayer->SEND_GOSSIP_MENU(10191,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10191, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warlock pPlayer->SEND_POI(9468.99, -6865.60, 7, 6, 0, "Celoenus"); - pPlayer->SEND_GOSSIP_MENU(10192,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10192, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(8659.90, -6368.12, 7, 6, 0, "Arcanist Sheynathren"); - pPlayer->SEND_GOSSIP_MENU(10193,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10193, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(8984.21, -7419.21, 7, 6, 0, "Arathel Sunforge"); - pPlayer->SEND_GOSSIP_MENU(10194,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10194, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(9494.04, -6881.51, 7, 6, 0, "Quarelestra"); - pPlayer->SEND_GOSSIP_MENU(10195,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10195, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Engineering - pPlayer->SEND_GOSSIP_MENU(10197,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10197, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //First Aid pPlayer->SEND_POI(9479.46, -6879.16, 7, 6, 0, "Kanaria"); - pPlayer->SEND_GOSSIP_MENU(10198,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10198, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Fishing - pPlayer->SEND_GOSSIP_MENU(10199,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10199, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Herbalism pPlayer->SEND_POI(8678.92, -6329.09, 7, 6, 0, "Botanist Tyniarrel"); - pPlayer->SEND_GOSSIP_MENU(10200,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10200, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Jewelcrafting pPlayer->SEND_POI(9484.32, -6874.98, 7, 6, 0, "Aleinia"); - pPlayer->SEND_GOSSIP_MENU(10203,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10203, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking pPlayer->SEND_POI(9362.04, -7130.33, 7, 6, 0, "Sathein"); - pPlayer->SEND_GOSSIP_MENU(10204,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10204, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Mining - pPlayer->SEND_GOSSIP_MENU(10205,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10205, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning pPlayer->SEND_POI(9362.04, -7130.33, 7, 6, 0, "Mathreyn"); - pPlayer->SEND_GOSSIP_MENU(10206,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10206, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring pPlayer->SEND_POI(8680.36, -6327.51, 7, 6, 0, "Sempstress Ambershine"); - pPlayer->SEND_GOSSIP_MENU(10207,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10207, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_eversong(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_eversong(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_eversong(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_eversong(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_eversong(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_eversong(pPlayer, pCreature, action); break; } return true; } @@ -1359,16 +1359,16 @@ bool GossipSelect_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 se * guard_eversong end *******************************************************/ -CreatureAI* GetAI_guard_eversong(Creature *_Creature) +CreatureAI* GetAI_guard_eversong(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_exodar start *******************************************************/ -bool GossipHello_guard_exodar(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_exodar(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1381,45 +1381,45 @@ bool GossipHello_guard_exodar(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(9551, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9551, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction house pPlayer->SEND_POI(-4023.6, -11739.3, 7, 6, 0, "Exodar Auction House"); - pPlayer->SEND_GOSSIP_MENU(9528, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9528, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bank pPlayer->SEND_POI(-3923.89, -11544.5, 7, 6, 0, "Exodar Bank"); - pPlayer->SEND_GOSSIP_MENU(9529, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9529, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Guild master pPlayer->SEND_POI(-4092.57, -11626.5, 7, 6, 0, "Exodar Guild Master"); - pPlayer->SEND_GOSSIP_MENU(9539, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9539, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Hippogryph master pPlayer->SEND_POI(-4060.46, -11787.1, 7, 6, 0, "Exodar Hippogryph Master"); - pPlayer->SEND_GOSSIP_MENU(9530, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9530, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Inn pPlayer->SEND_POI(-3741.87, -11695.1, 7, 6, 0, "Exodar Inn"); - pPlayer->SEND_GOSSIP_MENU(9545, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9545, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Mailbox pPlayer->SEND_POI(-3972.5, -11696.0, 7, 6, 0, "Mailbox"); - pPlayer->SEND_GOSSIP_MENU(10254, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10254, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Stable master pPlayer->SEND_POI(-3786.5, -11702.5, 7, 6, 0, "Stable Master Arthaid"); - pPlayer->SEND_GOSSIP_MENU(9558, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9558, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Weapon trainer pPlayer->SEND_POI(-4215.68, -11628.9, 7, 6, 0, "Weapon Master Handiir"); - pPlayer->SEND_GOSSIP_MENU(9565, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9565, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); @@ -1427,7 +1427,7 @@ void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 a pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARENA , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_EYEOFTHESTORM , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9531, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1437,7 +1437,7 @@ void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 a pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(9533, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9533, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1453,140 +1453,140 @@ void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 a pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(9555, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9555, pCreature->GetGUID()); break; } } -void SendBattleMasterMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(-3978.1, -11357, 7, 6, 0, "Alterac Valley Battlemaster"); - pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9531, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //AB pPlayer->SEND_POI(-3998.9, -11345.2, 7, 6, 0, "Arathi Basin Battlemaster"); - pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9531, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //A pPlayer->SEND_POI(-3759.27, -11695.63, 7, 6, 0, "Miglik Blotstrom"); - pPlayer->SEND_GOSSIP_MENU(10223, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10223, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //EOS pPlayer->SEND_POI(-3978.1, -11357, 7, 6, 0, "Eye Of The Storm Battlemaster"); - pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9531, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //WSG pPlayer->SEND_POI(-3977.5, -11381.2, 7, 6, 0, "Warsong Gulch Battlemaster"); - pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9531, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(-4276.0, -11495, 7, 6, 0, "Exodar Druid Trainer"); - pPlayer->SEND_GOSSIP_MENU(9534, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9534, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter pPlayer->SEND_POI(-4210.6, -11575.2, 7, 6, 0, "Exodar Hunter Trainer"); - pPlayer->SEND_GOSSIP_MENU(9544, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9544, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Mage pPlayer->SEND_POI(-4057.32, -11556.5, 7, 6, 0, "Exodar Mage Trainer"); - pPlayer->SEND_GOSSIP_MENU(9550, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9550, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Paladin pPlayer->SEND_POI(-4191.2, -11470.4, 7, 6, 0, "Exodar Paladin Trainer"); - pPlayer->SEND_GOSSIP_MENU(9553, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9553, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Priest pPlayer->SEND_POI(-3969.63, -11482.8, 7, 6, 0, "Exodar Priest Trainer"); - pPlayer->SEND_GOSSIP_MENU(9554, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9554, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Shaman pPlayer->SEND_POI(-3805.5, -11380.7, 7, 6, 0, "Exodar Shaman Trainer"); - pPlayer->SEND_GOSSIP_MENU(9556, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9556, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warrior pPlayer->SEND_POI(-4189.43, -11653.7, 7, 6, 0, "Exodar Warrior Trainer"); - pPlayer->SEND_GOSSIP_MENU(9562, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9562, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-4040.6, -11364.5, 7, 6, 0, "Exodar Alchemy Trainer"); - pPlayer->SEND_GOSSIP_MENU(9527, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9527, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-4229.5, -11706, 7, 6, 0, "Exodar Blacksmithing Trainer"); - pPlayer->SEND_GOSSIP_MENU(9532, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9532, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-3798.3, -11651.7, 7, 6, 0, "Exodar Cooking Trainer"); - pPlayer->SEND_GOSSIP_MENU(9551, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9551, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(-3889.3, -11495, 7, 6, 0, "Exodar Enchanting Trainer"); - pPlayer->SEND_GOSSIP_MENU(9535, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9535, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(-4257.68, -11640.3, 7, 6, 0, "Exodar Engineering Trainer"); - pPlayer->SEND_GOSSIP_MENU(9536, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9536, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(-3769.5, -11479.6, 7, 6, 0, "Exodar First Aid Trainer"); - pPlayer->SEND_GOSSIP_MENU(9537, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9537, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(-3725.5, -11385.2, 7, 6, 0, "Exodar Fishing Trainer"); - pPlayer->SEND_GOSSIP_MENU(9538, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9538, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Jewelcrafting pPlayer->SEND_POI(-3783, -11546, 7, 6, 0, "Exodar Jewelcrafting Trainer"); - pPlayer->SEND_GOSSIP_MENU(9547, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9547, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Herbalism pPlayer->SEND_POI(-4040.6, -11364.5, 7, 6, 0, "Exodar Herbalist Trainer"); - pPlayer->SEND_GOSSIP_MENU(9543, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9543, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Leatherworking pPlayer->SEND_POI(-4140.6, -11776.7, 7, 6, 0, "Exodar Leatherworking Trainer"); - pPlayer->SEND_GOSSIP_MENU(9549, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9549, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Mining pPlayer->SEND_POI(-4228, -11697, 7, 6, 0, "Exodar Mining Trainer"); - pPlayer->SEND_GOSSIP_MENU(9552, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9552, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Skinning pPlayer->SEND_POI(-4134.97, -11760.5, 7, 6, 0, "Exodar Skinning Trainer"); - pPlayer->SEND_GOSSIP_MENU(9557, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9557, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: //Tailoring pPlayer->SEND_POI(-4092.5, -11744.5, 7, 6, 0, "Exodar Tailor Trainer"); - pPlayer->SEND_GOSSIP_MENU(9559, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9559, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_exodar(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_exodar(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_exodar(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_exodar(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_exodar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_exodar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_exodar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_exodar(pPlayer, pCreature, action); break; } return true; } @@ -1595,16 +1595,16 @@ bool GossipSelect_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 send * guard_exodar end *******************************************************/ -CreatureAI* GetAI_guard_exodar(Creature *_Creature) +CreatureAI* GetAI_guard_exodar(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_ironforge start *******************************************************/ -bool GossipHello_guard_ironforge(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_ironforge(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_IRONFORGE_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1618,55 +1618,55 @@ bool GossipHello_guard_ironforge(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(2760, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2760, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction House pPlayer->SEND_POI(-4957.39, -911.6, 7, 6, 0, "Ironforge Auction House"); - pPlayer->SEND_GOSSIP_MENU(3014, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3014, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bank pPlayer->SEND_POI(-4891.91, -991.47, 7, 6, 0, "The Vault"); - pPlayer->SEND_GOSSIP_MENU(2761, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2761, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Tram pPlayer->SEND_POI(-4835.27, -1294.69, 7, 6, 0, "Deeprun Tram"); - pPlayer->SEND_GOSSIP_MENU(3814, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3814, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Gryphon Master pPlayer->SEND_POI(-4821.52, -1152.3, 7, 6, 0, "Ironforge Gryphon Master"); - pPlayer->SEND_GOSSIP_MENU(2762, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2762, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Guild Master pPlayer->SEND_POI(-5021, -996.45, 7, 6, 0, "Ironforge Visitor's Center"); - pPlayer->SEND_GOSSIP_MENU(2764, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2764, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Inn pPlayer->SEND_POI(-4850.47, -872.57, 7, 6, 0, "Stonefire Tavern"); - pPlayer->SEND_GOSSIP_MENU(2768, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2768, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Mailbox pPlayer->SEND_POI(-4845.7, -880.55, 7, 6, 0, "Ironforge Mailbox"); - pPlayer->SEND_GOSSIP_MENU(2769, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2769, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Stable Master pPlayer->SEND_POI(-5010.2, -1262, 7, 6, 0, "Ulbrek Firehand"); - pPlayer->SEND_GOSSIP_MENU(5986, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5986, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Weapons Trainer pPlayer->SEND_POI(-5040, -1201.88, 7, 6, 0, "Bixi and Buliwyf"); - pPlayer->SEND_GOSSIP_MENU(4518, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4518, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(7529, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7529, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Class Trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1677,7 +1677,7 @@ void SendDefaultMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8); - pPlayer->SEND_GOSSIP_MENU(2766, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2766, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Profession Trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1692,133 +1692,133 @@ void SendDefaultMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(2793, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2793, pCreature->GetGUID()); break; } } -void SendBattleMasterMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(-5047.87, -1263.77, 7, 6, 0, "Glordrum Steelbeard"); - pPlayer->SEND_GOSSIP_MENU(7483, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7483, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //AB pPlayer->SEND_POI(-5038.37, -1266.39, 7, 6, 0, "Donal Osgood"); - pPlayer->SEND_GOSSIP_MENU(7649, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7649, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //WSG pPlayer->SEND_POI(-5037.24, -1274.82, 7, 6, 0, "Lylandris"); - pPlayer->SEND_GOSSIP_MENU(7528, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7528, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Hunter pPlayer->SEND_POI(-5023, -1253.68, 7, 6, 0, "Hall of Arms"); - pPlayer->SEND_GOSSIP_MENU(2770, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2770, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Mage pPlayer->SEND_POI(-4627, -926.45, 7, 6, 0, "Hall of Mysteries"); - pPlayer->SEND_GOSSIP_MENU(2771, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2771, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Paladin pPlayer->SEND_POI(-4627.02, -926.45, 7, 6, 0, "Hall of Mysteries"); - pPlayer->SEND_GOSSIP_MENU(2773, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2773, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Priest pPlayer->SEND_POI(-4627, -926.45, 7, 6, 0, "Hall of Mysteries"); - pPlayer->SEND_GOSSIP_MENU(2772, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2772, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Rogue pPlayer->SEND_POI(-4647.83, -1124, 7, 6, 0, "Ironforge Rogue Trainer"); - pPlayer->SEND_GOSSIP_MENU(2774, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2774, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Warlock pPlayer->SEND_POI(-4605, -1110.45, 7, 6, 0, "Ironforge Warlock Trainer"); - pPlayer->SEND_GOSSIP_MENU(2775, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2775, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warrior pPlayer->SEND_POI(-5023.08, -1253.68, 7, 6, 0, "Hall of Arms"); - pPlayer->SEND_GOSSIP_MENU(2776, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2776, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Shaman pPlayer->SEND_POI(-4732, -1147, 7, 6, 0, "Ironforge Shaman Trainer"); //incorrect id - pPlayer->SEND_GOSSIP_MENU(2766, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2766, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-4858.5, -1241.83, 7, 6, 0, "Berryfizz's Potions and Mixed Drinks"); - pPlayer->SEND_GOSSIP_MENU(2794, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2794, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-4796.97, -1110.17, 7, 6, 0, "The Great Forge"); - pPlayer->SEND_GOSSIP_MENU(2795, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2795, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-4767.83, -1184.59, 7, 6, 0, "The Bronze Kettle"); - pPlayer->SEND_GOSSIP_MENU(2796, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2796, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(-4803.72, -1196.53, 7, 6, 0, "Thistlefuzz Arcanery"); - pPlayer->SEND_GOSSIP_MENU(2797, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2797, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(-4799.56, -1250.23, 7, 6, 0, "Springspindle's Gadgets"); - pPlayer->SEND_GOSSIP_MENU(2798, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2798, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(-4881.6, -1153.13, 7, 6, 0, "Ironforge Physician"); - pPlayer->SEND_GOSSIP_MENU(2799, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2799, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(-4597.91, -1091.93, 7, 6, 0, "Traveling Fisherman"); - pPlayer->SEND_GOSSIP_MENU(2800, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2800, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism pPlayer->SEND_POI(-4876.9, -1151.92, 7, 6, 0, "Ironforge Physician"); - pPlayer->SEND_GOSSIP_MENU(2801, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2801, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking pPlayer->SEND_POI(-4745, -1027.57, 7, 6, 0, "Finespindle's Leather Goods"); - pPlayer->SEND_GOSSIP_MENU(2802, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2802, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Minning pPlayer->SEND_POI(-4705.06, -1116.43, 7, 6, 0, "Deepmountain Mining Guild"); - pPlayer->SEND_GOSSIP_MENU(2804, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2804, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning pPlayer->SEND_POI(-4745, -1027.57, 7, 6, 0, "Finespindle's Leather Goods"); - pPlayer->SEND_GOSSIP_MENU(2805, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2805, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring pPlayer->SEND_POI(-4719.60, -1056.96, 7, 6, 0, "Stonebrow's Clothier"); - pPlayer->SEND_GOSSIP_MENU(2807, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2807, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_ironforge(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_ironforge(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_ironforge(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_ironforge(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_ironforge(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_ironforge(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_ironforge(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_ironforge(pPlayer, pCreature, action); break; } return true; } @@ -1827,16 +1827,16 @@ bool GossipSelect_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 s * guard_ironforge end *******************************************************/ -CreatureAI* GetAI_guard_ironforge(Creature *_Creature) +CreatureAI* GetAI_guard_ironforge(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_mulgore start *******************************************************/ -bool GossipHello_guard_mulgore(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_mulgore(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1844,34 +1844,34 @@ bool GossipHello_guard_mulgore(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(3543,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3543, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank - pPlayer->SEND_GOSSIP_MENU(4051,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4051, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Wind rider - pPlayer->SEND_GOSSIP_MENU(4052,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4052, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Inn pPlayer->SEND_POI(-2361.38, -349.19, 7, 6, 0, "Bloodhoof Village Inn"); - pPlayer->SEND_GOSSIP_MENU(4053,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4053, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Stable master pPlayer->SEND_POI(-2338.86, -357.56, 7, 6, 0, "Seikwa"); - pPlayer->SEND_GOSSIP_MENU(5976,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5976, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(4069,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4069, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -1885,86 +1885,86 @@ void SendDefaultMenu_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(4070,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4070, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(-2312.15, -443.69, 7, 6, 0, "Gennia Runetotem"); - pPlayer->SEND_GOSSIP_MENU(4054,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4054, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter pPlayer->SEND_POI(-2178.14, -406.14, 7, 6, 0, "Yaw Sharpmane"); - pPlayer->SEND_GOSSIP_MENU(4055,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4055, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Shaman pPlayer->SEND_POI(-2301.5, -439.87, 7, 6, 0, "Narm Skychaser"); - pPlayer->SEND_GOSSIP_MENU(4056,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4056, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Warrior pPlayer->SEND_POI(-2345.43, -494.11, 7, 6, 0, "Krang Stonehoof"); - pPlayer->SEND_GOSSIP_MENU(4057,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4057, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy - pPlayer->SEND_GOSSIP_MENU(4058,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4058, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing - pPlayer->SEND_GOSSIP_MENU(4059,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4059, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-2263.34, -287.91, 7, 6, 0, "Pyall Silentstride"); - pPlayer->SEND_GOSSIP_MENU(4060,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4060, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting - pPlayer->SEND_GOSSIP_MENU(4061,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4061, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //First Aid pPlayer->SEND_POI(-2353.52, -355.82, 7, 6, 0, "Vira Younghoof"); - pPlayer->SEND_GOSSIP_MENU(4062,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4062, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Fishing pPlayer->SEND_POI(-2349.21, -241.37, 7, 6, 0, "Uthan Stillwater"); - pPlayer->SEND_GOSSIP_MENU(4063,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4063, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Herbalism - pPlayer->SEND_GOSSIP_MENU(4064,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4064, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Leatherworking pPlayer->SEND_POI(-2257.12, -288.63, 7, 6, 0, "Chaw Stronghide"); - pPlayer->SEND_GOSSIP_MENU(4065,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4065, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Mining - pPlayer->SEND_GOSSIP_MENU(4066,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4066, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Skinning pPlayer->SEND_POI(-2252.94, -291.32, 7, 6, 0, "Yonn Deepcut"); - pPlayer->SEND_GOSSIP_MENU(4067,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4067, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Tailoring - pPlayer->SEND_GOSSIP_MENU(4068,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4068, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_mulgore(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_mulgore(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_mulgore(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_mulgore(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_mulgore(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_mulgore(pPlayer, pCreature, action); break; } return true; } @@ -1973,16 +1973,16 @@ bool GossipSelect_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 sen * guard_mulgore end *******************************************************/ -CreatureAI* GetAI_guard_mulgore(Creature *_Creature) +CreatureAI* GetAI_guard_mulgore(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_orgrimmar start *******************************************************/ -bool GossipHello_guard_orgrimmar(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_orgrimmar(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1997,60 +1997,60 @@ bool GossipHello_guard_orgrimmar(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(2593,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2593, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_POI(1631.51, -4375.33, 7, 6, 0, "Bank of Orgrimmar"); - pPlayer->SEND_GOSSIP_MENU(2554,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2554, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //wind rider pPlayer->SEND_POI(1676.6, -4332.72, 7, 6, 0, "The Sky Tower"); - pPlayer->SEND_GOSSIP_MENU(2555,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2555, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //guild master pPlayer->SEND_POI(1576.93, -4294.75, 7, 6, 0, "Horde Embassy"); - pPlayer->SEND_GOSSIP_MENU(2556,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2556, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->SEND_POI(1644.51, -4447.27, 7, 6, 0, "Orgrimmar Inn"); - pPlayer->SEND_GOSSIP_MENU(2557,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2557, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //mailbox pPlayer->SEND_POI(1622.53, -4388.79, 7, 6, 0, "Orgrimmar Mailbox"); - pPlayer->SEND_GOSSIP_MENU(2558,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2558, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //auction house pPlayer->SEND_POI(1679.21, -4450.1, 7, 6, 0, "Orgrimmar Auction House"); - pPlayer->SEND_GOSSIP_MENU(3075,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3075, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //zeppelin pPlayer->SEND_POI(1337.36, -4632.7, 7, 6, 0, "Orgrimmar Zeppelin Tower"); - pPlayer->SEND_GOSSIP_MENU(3173,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3173, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //weapon master pPlayer->SEND_POI(2092.56, -4823.95, 7, 6, 0, "Sayoc & Hanashi"); - pPlayer->SEND_GOSSIP_MENU(4519,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4519, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //stable master pPlayer->SEND_POI(2133.12, -4663.93, 7, 6, 0, "Xon'cha"); - pPlayer->SEND_GOSSIP_MENU(5974,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5974, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //officers lounge pPlayer->SEND_POI(1633.56, -4249.37, 7, 6, 0, "Hall of Legends"); - pPlayer->SEND_GOSSIP_MENU(7046,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7046, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(7521,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7521, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -2061,7 +2061,7 @@ void SendDefaultMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8); - pPlayer->SEND_GOSSIP_MENU(2599,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2599, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: //profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -2076,132 +2076,132 @@ void SendDefaultMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(2594,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2594, pCreature->GetGUID()); break; } } -void SendBattleMasterMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave"); - pPlayer->SEND_GOSSIP_MENU(7484,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7484, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //AB pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave"); - pPlayer->SEND_GOSSIP_MENU(7644,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7644, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //WSG pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave"); - pPlayer->SEND_GOSSIP_MENU(7520,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7520, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Hunter pPlayer->SEND_POI(2114.84, -4625.31, 7, 6, 0, "Orgrimmar Hunter's Hall"); - pPlayer->SEND_GOSSIP_MENU(2559,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2559, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Mage pPlayer->SEND_POI(1451.26, -4223.33, 7, 6, 0, "Darkbriar Lodge"); - pPlayer->SEND_GOSSIP_MENU(2560,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2560, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Priest pPlayer->SEND_POI(1442.21, -4183.24, 7, 6, 0, "Spirit Lodge"); - pPlayer->SEND_GOSSIP_MENU(2561,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2561, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Shaman pPlayer->SEND_POI(1925.34, -4181.89, 7, 6, 0, "Thrall's Fortress"); - pPlayer->SEND_GOSSIP_MENU(2562,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2562, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Rogue pPlayer->SEND_POI(1773.39, -4278.97, 7, 6, 0, "Shadowswift Brotherhood"); - pPlayer->SEND_GOSSIP_MENU(2563,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2563, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Warlock pPlayer->SEND_POI(1849.57, -4359.68, 7, 6, 0, "Darkfire Enclave"); - pPlayer->SEND_GOSSIP_MENU(2564,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2564, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warrior pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave"); - pPlayer->SEND_GOSSIP_MENU(2565,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2565, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Paladin pPlayer->SEND_POI(1906.65, -4134.26, 7, 6, 0, "Valley of Wisdom"); - pPlayer->SEND_GOSSIP_MENU(10843,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10843, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(1955.17, -4475.79, 7, 6, 0, "Yelmak's Alchemy and Potions"); - pPlayer->SEND_GOSSIP_MENU(2497,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2497, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(2054.34, -4831.85, 7, 6, 0, "The Burning Anvil"); - pPlayer->SEND_GOSSIP_MENU(2499,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2499, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(1780.96, -4481.31, 7, 6, 0, "Borstan's Firepit"); - pPlayer->SEND_GOSSIP_MENU(2500,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2500, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(1917.5, -4434.95, 7, 6, 0, "Godan's Runeworks"); - pPlayer->SEND_GOSSIP_MENU(2501,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2501, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(2038.45, -4744.75, 7, 6, 0, "Nogg's Machine Shop"); - pPlayer->SEND_GOSSIP_MENU(2653,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2653, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(1485.21, -4160.91, 7, 6, 0, "Survival of the Fittest"); - pPlayer->SEND_GOSSIP_MENU(2502,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2502, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(1994.15, -4655.7, 7, 6, 0, "Lumak's Fishing"); - pPlayer->SEND_GOSSIP_MENU(2503,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2503, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism pPlayer->SEND_POI(1898.61, -4454.93, 7, 6, 0, "Jandi's Arboretum"); - pPlayer->SEND_GOSSIP_MENU(2504,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2504, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking pPlayer->SEND_POI(1852.82, -4562.31, 7, 6, 0, "Kodohide Leatherworkers"); - pPlayer->SEND_GOSSIP_MENU(2513,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2513, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Mining pPlayer->SEND_POI(2029.79, -4704, 7, 6, 0, "Red Canyon Mining"); - pPlayer->SEND_GOSSIP_MENU(2515,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2515, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning pPlayer->SEND_POI(1852.82, -4562.31, 7, 6, 0, "Kodohide Leatherworkers"); - pPlayer->SEND_GOSSIP_MENU(2516,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2516, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring pPlayer->SEND_POI(1802.66, -4560.66, 7, 6, 0, "Magar's Cloth Goods"); - pPlayer->SEND_GOSSIP_MENU(2518,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2518, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_orgrimmar(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_orgrimmar(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_orgrimmar(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_orgrimmar(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_orgrimmar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_orgrimmar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_orgrimmar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_orgrimmar(pPlayer, pCreature, action); break; } return true; } @@ -2210,16 +2210,16 @@ bool GossipSelect_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 s * guard_orgrimmar end *******************************************************/ -CreatureAI* GetAI_guard_orgrimmar(Creature *_Creature) +CreatureAI* GetAI_guard_orgrimmar(Creature* pCreature) { - return new guardAI_orgrimmar (_Creature); + return new guardAI_orgrimmar (pCreature); } /******************************************************* * guard_shattrath start *******************************************************/ -bool GossipHello_guard_shattrath(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_shattrath(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -2232,50 +2232,50 @@ bool GossipHello_guard_shattrath(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(10321, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10321, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Tavern pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern"); - pPlayer->SEND_GOSSIP_MENU(10394, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10394, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bank pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKALDOR , GOSSIP_SENDER_SEC_BANK, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKSCYERS , GOSSIP_SENDER_SEC_BANK, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(10379, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10379, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Inn pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNALDOR , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNSCYERS , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(10382, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10382, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Flight master pPlayer->SEND_POI(-1832, 5299, 7, 6, 0, "Flight Master"); - pPlayer->SEND_GOSSIP_MENU(10385, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10385, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Mailbox pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKALDOR , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNALDOR , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKSCYERS , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNSCYERS , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(10386, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10386, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Stable master pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEALDOR , GOSSIP_SENDER_SEC_STABLEMASTER, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLESCYERS , GOSSIP_SENDER_SEC_STABLEMASTER, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(10387, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10387, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(10388, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10388, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Profession master pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -2286,173 +2286,173 @@ void SendDefaultMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8); - pPlayer->SEND_GOSSIP_MENU(10391, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10391, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Mana Loom pPlayer->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom"); - pPlayer->SEND_GOSSIP_MENU(10503, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10503, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Alchemy Lab pPlayer->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab"); - pPlayer->SEND_GOSSIP_MENU(10321, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10321, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Gem Merchant pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMALDOR , GOSSIP_SENDER_SEC_GEMMERCHANT, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMSCYERS , GOSSIP_SENDER_SEC_GEMMERCHANT, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(10697, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10697, pCreature->GetGUID()); break; } } -void SendBankMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBankMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank"); - pPlayer->SEND_GOSSIP_MENU(10380, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10380, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(-1997.7, 5363, 7, 6, 0, "Scyers Bank"); - pPlayer->SEND_GOSSIP_MENU(10381, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10381, pCreature->GetGUID()); } } -void SendInnMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action) +void SendInnMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn"); - pPlayer->SEND_GOSSIP_MENU(10383, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10383, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(-2178, 5405, 7, 6, 0, "Scyers Inn"); - pPlayer->SEND_GOSSIP_MENU(10384, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10384, pCreature->GetGUID()); } } -void SendMailboxMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action) +void SendMailboxMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank"); - pPlayer->SEND_GOSSIP_MENU(10380, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10380, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: pPlayer->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn"); - pPlayer->SEND_GOSSIP_MENU(10383, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10383, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: pPlayer->SEND_POI(-1997.7, 5363, 7, 6, 0, "Scyers Bank"); - pPlayer->SEND_GOSSIP_MENU(10381, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10381, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: pPlayer->SEND_POI(-2178, 5405, 7, 6, 0, "Scyers Inn"); - pPlayer->SEND_GOSSIP_MENU(10384, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10384, pCreature->GetGUID()); break; } } -void SendStableMasterMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action) +void SendStableMasterMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(-1888.5, 5761, 7, 6, 0, "Aldor Stable"); - pPlayer->SEND_GOSSIP_MENU(10321, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10321, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(-2170, 5404, 7, 6, 0, "Scyers Stable"); - pPlayer->SEND_GOSSIP_MENU(10321, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10321, pCreature->GetGUID()); } } -void SendBattleMasterMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->SEND_POI(-1774, 5251, 7, 6, 0, "Alliance Battlemasters"); - pPlayer->SEND_GOSSIP_MENU(10389, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10389, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: pPlayer->SEND_POI(-1963, 5263, 7, 6, 0, "Horde Battlemasters"); - pPlayer->SEND_GOSSIP_MENU(10390, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10390, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: pPlayer->SEND_POI(-1960, 5175, 7, 6, 0, "Arena Battlemasters"); - pPlayer->SEND_GOSSIP_MENU(12510, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(12510, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem"); - pPlayer->SEND_GOSSIP_MENU(10392, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10392, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury"); - pPlayer->SEND_GOSSIP_MENU(10400, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10400, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper"); - pPlayer->SEND_GOSSIP_MENU(10393, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10393, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan"); - pPlayer->SEND_GOSSIP_MENU(10395, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10395, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //First Aid pPlayer->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher"); - pPlayer->SEND_GOSSIP_MENU(10396, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10396, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Jewelcrafting pPlayer->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar"); - pPlayer->SEND_GOSSIP_MENU(10397, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10397, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Leatherworking pPlayer->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari"); - pPlayer->SEND_GOSSIP_MENU(10399, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10399, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Skinning pPlayer->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour"); - pPlayer->SEND_GOSSIP_MENU(10398, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10398, pCreature->GetGUID()); break; } } -void SendGemMerchantMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action) +void SendGemMerchantMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(-1645, 5669.5, 7, 6, 0, "Aldor Gem Merchant"); - pPlayer->SEND_GOSSIP_MENU(10698, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10698, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(-2193, 5424.5, 7, 6, 0, "Scyers Gem Merchant"); - pPlayer->SEND_GOSSIP_MENU(10699, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10699, pCreature->GetGUID()); } } -bool GossipSelect_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BANK: SendBankMenu_guard_shattrath(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_INN: SendInnMenu_guard_shattrath(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_STABLEMASTER: SendStableMasterMenu_guard_shattrath(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_GEMMERCHANT: SendGemMerchantMenu_guard_shattrath(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_MAILBOX: SendMailboxMenu_guard_shattrath(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BANK: SendBankMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_INN: SendInnMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_STABLEMASTER: SendStableMasterMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_GEMMERCHANT: SendGemMerchantMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_MAILBOX: SendMailboxMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, action); break; } return true; } @@ -2461,9 +2461,9 @@ bool GossipSelect_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 s * guard_shattrath end *******************************************************/ -CreatureAI* GetAI_guard_shattrath(Creature *_Creature) +CreatureAI* GetAI_guard_shattrath(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* @@ -2530,7 +2530,7 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI } }; -bool GossipHello_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -2543,44 +2543,44 @@ bool GossipHello_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(10524, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10524, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Tavern pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern"); - pPlayer->SEND_GOSSIP_MENU(10394, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10394, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bank pPlayer->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank"); - pPlayer->SEND_GOSSIP_MENU(10380, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10380, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Inn pPlayer->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn"); - pPlayer->SEND_GOSSIP_MENU(10525, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10525, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Flight master pPlayer->SEND_POI(-1832, 5299, 7, 6, 0, "Shattrath Flight Master"); - pPlayer->SEND_GOSSIP_MENU(10402, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10402, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Mailbox pPlayer->SEND_POI(0, 0, 7, 6, 0, "Aldor Mailbox"); //unknown - pPlayer->SEND_GOSSIP_MENU(10524, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10524, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Stable master pPlayer->SEND_POI(-1888.5, 5761, 7, 6, 0, "Aldor Stable Master"); - pPlayer->SEND_GOSSIP_MENU(10527, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10527, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(10388, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10388, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Profession master pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -2591,69 +2591,69 @@ void SendDefaultMenu_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature, pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8); - pPlayer->SEND_GOSSIP_MENU(10391, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10391, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Mana Loom pPlayer->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom"); - pPlayer->SEND_GOSSIP_MENU(10522, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10522, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Alchemy Lab pPlayer->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab"); - pPlayer->SEND_GOSSIP_MENU(10696, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10696, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Gem Merchant pPlayer->SEND_POI(-1645, 5669.5, 7, 6, 0, "Aldor Gem Merchant"); - pPlayer->SEND_GOSSIP_MENU(10411, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10411, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem"); - pPlayer->SEND_GOSSIP_MENU(10392, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10392, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury"); - pPlayer->SEND_GOSSIP_MENU(10400, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10400, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper"); - pPlayer->SEND_GOSSIP_MENU(10393, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10393, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan"); - pPlayer->SEND_GOSSIP_MENU(10528, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10528, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //First Aid pPlayer->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher"); - pPlayer->SEND_GOSSIP_MENU(10396, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10396, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Jewelcrafting pPlayer->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar"); - pPlayer->SEND_GOSSIP_MENU(10529, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10529, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Leatherworking pPlayer->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari"); - pPlayer->SEND_GOSSIP_MENU(10399, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10399, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Skinning pPlayer->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour"); - pPlayer->SEND_GOSSIP_MENU(10419, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10419, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath_aldor(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath_aldor(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath_aldor(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath_aldor(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, action); break; } return true; } @@ -2662,9 +2662,9 @@ bool GossipSelect_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature, ui * guard_shattrath_aldor end *******************************************************/ -CreatureAI* GetAI_guard_shattrath_aldor(Creature *_Creature) +CreatureAI* GetAI_guard_shattrath_aldor(Creature* pCreature) { - return new guard_shattrath_aldorAI (_Creature); + return new guard_shattrath_aldorAI (pCreature); } /******************************************************* @@ -2726,7 +2726,7 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI } }; -bool GossipHello_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -2739,43 +2739,43 @@ bool GossipHello_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(10430, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10430, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Tavern pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern"); - pPlayer->SEND_GOSSIP_MENU(10431, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10431, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bank pPlayer->SEND_POI(-1996.6, 5363.7, 7, 6, 0, "Scryer Bank"); - pPlayer->SEND_GOSSIP_MENU(10432, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10432, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Inn pPlayer->SEND_POI(-2176.6, 5405.8, 7, 6, 0, "Scryer Inn"); - pPlayer->SEND_GOSSIP_MENU(10433, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10433, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Flight master pPlayer->SEND_POI(-1832, 5299, 7, 6, 0, "Shattrath Flight Master"); - pPlayer->SEND_GOSSIP_MENU(10435, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10435, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Mailbox pPlayer->SEND_POI(-2174.3, 5411.4, 7, 6, 0, "Scryer Mailbox"); - pPlayer->SEND_GOSSIP_MENU(10436, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10436, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Stable master pPlayer->SEND_POI(-2169.9, 5405.1, 7, 6, 0, "Scryer Stable Master"); - pPlayer->SEND_GOSSIP_MENU(10437, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10437, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(10438, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10438, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Profession master pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -2786,69 +2786,69 @@ void SendDefaultMenu_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8); - pPlayer->SEND_GOSSIP_MENU(10504, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10504, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Mana Loom pPlayer->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom"); - pPlayer->SEND_GOSSIP_MENU(10522, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10522, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Alchemy Lab pPlayer->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab"); - pPlayer->SEND_GOSSIP_MENU(10701, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10701, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Gem Merchant pPlayer->SEND_POI(-1645, 5669.5, 7, 6, 0, "Scryer Gem Merchant"); - pPlayer->SEND_GOSSIP_MENU(10702, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10702, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem"); - pPlayer->SEND_GOSSIP_MENU(10516, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10516, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury"); - pPlayer->SEND_GOSSIP_MENU(10517, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10517, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper"); - pPlayer->SEND_GOSSIP_MENU(10518, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10518, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan"); - pPlayer->SEND_GOSSIP_MENU(10519, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10519, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //First Aid pPlayer->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher"); - pPlayer->SEND_GOSSIP_MENU(10520, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10520, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Jewelcrafting pPlayer->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar"); - pPlayer->SEND_GOSSIP_MENU(10521, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10521, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Leatherworking pPlayer->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari"); - pPlayer->SEND_GOSSIP_MENU(10523, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10523, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Skinning pPlayer->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour"); - pPlayer->SEND_GOSSIP_MENU(10523, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10523, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath_scryer(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath_scryer(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath_scryer(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath_scryer(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, action); break; } return true; } @@ -2857,16 +2857,16 @@ bool GossipSelect_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature, u * guard_shattrath_scryer end *******************************************************/ -CreatureAI* GetAI_guard_shattrath_scryer(Creature *_Creature) +CreatureAI* GetAI_guard_shattrath_scryer(Creature* pCreature) { - return new guard_shattrath_scryerAI (_Creature); + return new guard_shattrath_scryerAI (pCreature); } /******************************************************* * guard_silvermoon start *******************************************************/ -bool GossipHello_guard_silvermoon(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_silvermoon(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -2879,47 +2879,47 @@ bool GossipHello_guard_silvermoon(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9316, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction house pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AH_SILVERMOON_1 , GOSSIP_SENDER_SEC_AUCTIONHOUSE, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AH_SILVERMOON_2 , GOSSIP_SENDER_SEC_AUCTIONHOUSE, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9317, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9317, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bank pPlayer->SEND_POI(9808.4, -7488.16, 7, 6, 0, "Silvermoon Bank"); - pPlayer->SEND_GOSSIP_MENU(9322, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9322, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Guild master pPlayer->SEND_POI(9474.97, -7345.21, 7, 6, 0, "Tandrine"); - pPlayer->SEND_GOSSIP_MENU(9324, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9324, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN_SILVERMOON_1 , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN_SILVERMOON_2 , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9602, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9602, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Mailbox pPlayer->SEND_POI(9658.33, -7492.17, 7, 6, 0, "Silvermoon Mailbox"); - pPlayer->SEND_GOSSIP_MENU(9326, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9326, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Stable master pPlayer->SEND_POI(9904.95, -7404.31, 7, 6, 0, "Shalenn"); - pPlayer->SEND_GOSSIP_MENU(9327, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9327, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Weapon trainer pPlayer->SEND_POI(9841.17, -7505.13, 7, 6, 0, "Ileda"); - pPlayer->SEND_GOSSIP_MENU(9328, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9328, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Wind master pPlayer->SEND_POI(9378.45, -7163.94, 7, 6, 0, "Silvermoon Wind Master"); - pPlayer->SEND_GOSSIP_MENU(10181, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10181, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); @@ -2927,7 +2927,7 @@ void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARENA , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_EYEOFTHESTORM , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9329, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -2937,7 +2937,7 @@ void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(9331, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9331, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -2953,170 +2953,170 @@ void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(9338, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9338, pCreature->GetGUID()); break; } } -void SendAuctionhouseMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action) +void SendAuctionhouseMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(9644.47, -7140.22, 7, 6, 0, "Western Auction House"); - pPlayer->SEND_GOSSIP_MENU(9318, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9318, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(9683.27, -7521.22, 7, 6, 0, "Royal Exchange Auction House"); - pPlayer->SEND_GOSSIP_MENU(9319, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9319, pCreature->GetGUID()); } } -void SendInnMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action) +void SendInnMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(9677.7, -7368, 7, 6, 0, "Silvermoon City Inn"); - pPlayer->SEND_GOSSIP_MENU(9325, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9325, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(9561.1, -7517.5, 7, 6, 0, "Wayfarer's Rest tavern"); - pPlayer->SEND_GOSSIP_MENU(9603, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9603, pCreature->GetGUID()); } } -void SendBattleMasterMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(9850.49, -7572.26, 7, 6, 0, "Gurak"); - pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9329, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //AB pPlayer->SEND_POI(9857.18, -7564.36, 7, 6, 0, "Karen Wentworth"); - pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9329, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //A pPlayer->SEND_POI(9850.6, -7559.25, 7, 6, 0, "Bipp Glizzitor"); - pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9329, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //EOS pPlayer->SEND_POI(9857.18, -7564.36, 7, 6, 0, "Karen Wentworth"); - pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9329, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //WSG pPlayer->SEND_POI(9845.45, -7562.58, 7, 6, 0, "Krukk"); - pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9329, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(9700.55, -7262.57, 7, 6, 0, "Harene Plainwalker"); - pPlayer->SEND_GOSSIP_MENU(9330, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9330, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter pPlayer->SEND_POI(9927.48, -7426.14, 7, 6, 0, "Zandine"); - pPlayer->SEND_GOSSIP_MENU(9332, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9332, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Mage pPlayer->SEND_POI(9995.07, -7118.17, 7, 6, 0, "Quithas"); - pPlayer->SEND_GOSSIP_MENU(9333, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9333, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Paladin pPlayer->SEND_POI(9850.22, -7516.93, 7, 6, 0, "Champion Bachi"); - pPlayer->SEND_GOSSIP_MENU(9334, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9334, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Priest pPlayer->SEND_POI(9926.79, -7066.66, 7, 6, 0, "Belestra"); - pPlayer->SEND_GOSSIP_MENU(9335, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9335, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Rogue pPlayer->SEND_POI(9739.88, -7374.33, 7, 6, 0, "Zelanis"); - pPlayer->SEND_GOSSIP_MENU(9336, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9336, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Warlock pPlayer->SEND_POI(9787.57, -7284.63, 7, 6, 0, "Alamma"); - pPlayer->SEND_GOSSIP_MENU(9337, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9337, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(9998.09, -7214.36, 7, 6, 0, "Silvermoon Alchemy Trainer"); - pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9316, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(9841.43, -7361.53, 7, 6, 0, "Silvermoon Blacksmithing Trainer"); - pPlayer->SEND_GOSSIP_MENU(9340, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9340, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(9577.26, -7243.6, 7, 6, 0, "Silvermoon Cooking Trainer"); - pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9316, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(9962.57, -7246.18, 7, 6, 0, "Silvermoon Enchanting Trainer"); - pPlayer->SEND_GOSSIP_MENU(9341, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9341, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(9820.18, -7329.56, 7, 6, 0, "Silvermoon Engineering Trainer"); - pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9316, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(9579.8, -7343.71, 7, 6, 0, "Silvermoon First Aid Trainer"); - pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9316, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(9602.73, -7328.3, 7, 6, 0, "Silvermoon Fishing Trainer"); - pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9316, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Jewelcrafting pPlayer->SEND_POI(9553.54, -7506.43, 7, 6, 0, "Silvermoon Jewelcrafting Trainer"); - pPlayer->SEND_GOSSIP_MENU(9346, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9346, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Herbalism pPlayer->SEND_POI(10004.4, -7216.86, 7, 6, 0, "Silvermoon Herbalism Trainer"); - pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9316, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Leatherworking pPlayer->SEND_POI(9503.72, -7430.16, 7, 6, 0, "Silvermoon Leatherworking Trainer"); - pPlayer->SEND_GOSSIP_MENU(9347, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9347, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Mining pPlayer->SEND_POI(9805.1, -7355.56, 7, 6, 0, "Silvermoon Mining Trainer"); - pPlayer->SEND_GOSSIP_MENU(9348, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9348, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Skinning pPlayer->SEND_POI(9513.37, -7429.4, 7, 6, 0, "Silvermoon Skinning Trainer"); - pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9316, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: //Tailoring pPlayer->SEND_POI(9750.55, -7095.28, 7, 6, 0, "Silvermoon Tailor"); - pPlayer->SEND_GOSSIP_MENU(9350, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9350, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_silvermoon(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_AUCTIONHOUSE: SendAuctionhouseMenu_guard_silvermoon(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_INN: SendInnMenu_guard_silvermoon(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_silvermoon(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_silvermoon(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_silvermoon(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_silvermoon(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_AUCTIONHOUSE: SendAuctionhouseMenu_guard_silvermoon(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_INN: SendInnMenu_guard_silvermoon(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_silvermoon(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_silvermoon(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_silvermoon(pPlayer, pCreature, action); break; } return true; } @@ -3125,16 +3125,16 @@ bool GossipSelect_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 * guard_silvermoon end *******************************************************/ -CreatureAI* GetAI_guard_silvermoon(Creature *_Creature) +CreatureAI* GetAI_guard_silvermoon(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_stormwind start *******************************************************/ -bool GossipHello_guard_stormwind(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_stormwind(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STORMWIND_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -3149,59 +3149,59 @@ bool GossipHello_guard_stormwind(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(933,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(933, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction House pPlayer->SEND_POI(-8811.46, 667.46, 7, 6, 0, "Stormwind Auction House"); - pPlayer->SEND_GOSSIP_MENU(3834,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3834, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bank pPlayer->SEND_POI(-8916.87, 622.87, 7, 6, 0, "Stormwind Bank"); - pPlayer->SEND_GOSSIP_MENU(764,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(764, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Deeprun tram pPlayer->SEND_POI(-8378.88, 554.23, 7, 6, 0, "The Deeprun Tram"); - pPlayer->SEND_GOSSIP_MENU(3813,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3813, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->SEND_POI(-8869.0, 675.4, 7, 6, 0, "The Gilded Rose"); - pPlayer->SEND_GOSSIP_MENU(3860,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3860, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Gryphon Master pPlayer->SEND_POI(-8837.0, 493.5, 7, 6, 0, "Stormwind Gryphon Master"); - pPlayer->SEND_GOSSIP_MENU(879,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(879, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Guild Master pPlayer->SEND_POI(-8894.0, 611.2, 7, 6, 0, "Stormwind Vistor`s Center"); - pPlayer->SEND_GOSSIP_MENU(882,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(882, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Mailbox pPlayer->SEND_POI(-8876.48, 649.18, 7, 6, 0, "Stormwind Mailbox"); - pPlayer->SEND_GOSSIP_MENU(3861,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3861, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Stable Master pPlayer->SEND_POI(-8433.0, 554.7, 7, 6, 0, "Jenova Stoneshield"); - pPlayer->SEND_GOSSIP_MENU(5984,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5984, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Weapon Trainer pPlayer->SEND_POI(-8797.0, 612.8, 7, 6, 0, "Woo Ping"); - pPlayer->SEND_GOSSIP_MENU(4516,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4516, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Officers Lounge pPlayer->SEND_POI(-8759.92, 399.69, 7, 6, 0, "Champions` Hall"); - pPlayer->SEND_GOSSIP_MENU(7047,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7047, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Battlemasters pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(7499,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7499, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Class trainers pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -3213,7 +3213,7 @@ void SendDefaultMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 9); - pPlayer->SEND_GOSSIP_MENU(898,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(898, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: //Profession trainers pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -3228,137 +3228,137 @@ void SendDefaultMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(918,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(918, pCreature->GetGUID()); break; } } -void SendBattleMasterMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Thelman Slatefist"); - pPlayer->SEND_GOSSIP_MENU(7500, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7500, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //AB pPlayer->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Lady Hoteshem"); - pPlayer->SEND_GOSSIP_MENU(7650, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7650, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //WSG pPlayer->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Elfarran"); - pPlayer->SEND_GOSSIP_MENU(7501, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7501, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Mage pPlayer->SEND_POI(-9012.0, 867.6, 7, 6, 0, "Wizard`s Sanctum"); - pPlayer->SEND_GOSSIP_MENU(899,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(899, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Rogue pPlayer->SEND_POI(-8753.0, 367.8, 7, 6, 0, "Stormwind - Rogue House"); - pPlayer->SEND_GOSSIP_MENU(900,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(900, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Warrior pPlayer->SEND_POI(-8690.11, 324.85, 7, 6, 0, "Command Center"); - pPlayer->SEND_GOSSIP_MENU(901,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(901, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Druid pPlayer->SEND_POI(-8751.0, 1124.5, 7, 6, 0, "The Park"); - pPlayer->SEND_GOSSIP_MENU(902,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(902, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Priest pPlayer->SEND_POI(-8512.0, 862.4, 7, 6, 0, "Catedral Of Light"); - pPlayer->SEND_GOSSIP_MENU(903,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(903, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Paladin pPlayer->SEND_POI(-8577.0, 881.7, 7, 6, 0, "Catedral Of Light"); - pPlayer->SEND_GOSSIP_MENU(904,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(904, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Hunter pPlayer->SEND_POI(-8413.0, 541.5, 7, 6, 0, "Hunter Lodge"); - pPlayer->SEND_GOSSIP_MENU(905,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(905, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Warlock pPlayer->SEND_POI(-8948.91, 998.35, 7, 6, 0, "The Slaughtered Lamb"); - pPlayer->SEND_GOSSIP_MENU(906,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(906, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Shaman pPlayer->SEND_POI(-9033, 550, 7, 6, 0, "Valley Of Heroes"); //incorrect id - pPlayer->SEND_GOSSIP_MENU(2593,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2593, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-8988.0, 759.60, 7, 6, 0, "Alchemy Needs"); - pPlayer->SEND_GOSSIP_MENU(919,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(919, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(-8424.0, 616.9, 7, 6, 0, "Therum Deepforge"); - pPlayer->SEND_GOSSIP_MENU(920,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(920, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(-8611.0, 364.6, 7, 6, 0, "Pig and Whistle Tavern"); - pPlayer->SEND_GOSSIP_MENU(921,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(921, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(-8858.0, 803.7, 7, 6, 0, "Lucan Cordell"); - pPlayer->SEND_GOSSIP_MENU(941,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(941, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(-8347.0, 644.1, 7, 6, 0, "Lilliam Sparkspindle"); - pPlayer->SEND_GOSSIP_MENU(922,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(922, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(-8513.0, 801.8, 7, 6, 0, "Shaina Fuller"); - pPlayer->SEND_GOSSIP_MENU(923,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(923, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(-8803.0, 767.5, 7, 6, 0, "Arnold Leland"); - pPlayer->SEND_GOSSIP_MENU(940,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(940, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism pPlayer->SEND_POI(-8967.0, 779.5, 7, 6, 0, "Alchemy Needs"); - pPlayer->SEND_GOSSIP_MENU(924,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(924, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking pPlayer->SEND_POI(-8726.0, 477.4, 7, 6, 0, "The Protective Hide"); - pPlayer->SEND_GOSSIP_MENU(925,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(925, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Mining pPlayer->SEND_POI(-8434.0, 692.8, 7, 6, 0, "Gelman Stonehand"); - pPlayer->SEND_GOSSIP_MENU(927,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(927, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning pPlayer->SEND_POI(-8716.0, 469.4, 7, 6, 0, "The Protective Hide"); - pPlayer->SEND_GOSSIP_MENU(928,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(928, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring pPlayer->SEND_POI(-8938.0, 800.7, 7, 6, 0, "Duncan`s Textiles"); - pPlayer->SEND_GOSSIP_MENU(929,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(929, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_stormwind(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_stormwind(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_stormwind(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_stormwind(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_stormwind(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_stormwind(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_stormwind(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_stormwind(pPlayer, pCreature, action); break; } return true; } @@ -3367,16 +3367,16 @@ bool GossipSelect_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 s * guard_stormwind end *******************************************************/ -CreatureAI* GetAI_guard_stormwind(Creature *_Creature) +CreatureAI* GetAI_guard_stormwind(Creature* pCreature) { - return new guardAI_stormwind (_Creature); + return new guardAI_stormwind (pCreature); } /******************************************************* * guard_teldrassil start *******************************************************/ -bool GossipHello_guard_teldrassil(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_teldrassil(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FERRY , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -3385,30 +3385,30 @@ bool GossipHello_guard_teldrassil(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(4316,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4316, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank - pPlayer->SEND_GOSSIP_MENU(4317,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4317, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Rut`theran - pPlayer->SEND_GOSSIP_MENU(4318,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4318, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Guild master - pPlayer->SEND_GOSSIP_MENU(4319,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4319, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->SEND_POI(9821.49, 960.13, 7, 6, 0, "Dolanaar Inn"); - pPlayer->SEND_GOSSIP_MENU(4320,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4320, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //stable master pPlayer->SEND_POI(9808.37, 931.1, 7, 6, 0, "Seriadne"); - pPlayer->SEND_GOSSIP_MENU(5982,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5982, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -3416,7 +3416,7 @@ void SendDefaultMenu_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(4264,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4264, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -3428,86 +3428,86 @@ void SendDefaultMenu_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9); - pPlayer->SEND_GOSSIP_MENU(4273,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4273, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(9741.58, 963.7, 7, 6, 0, "Kal"); - pPlayer->SEND_GOSSIP_MENU(4323,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4323, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Hunter pPlayer->SEND_POI(9815.12, 926.28, 7, 6, 0, "Dazalar"); - pPlayer->SEND_GOSSIP_MENU(4324,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4324, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Priest pPlayer->SEND_POI(9906.16, 986.63, 7, 6, 0, "Laurna Morninglight"); - pPlayer->SEND_GOSSIP_MENU(4325,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4325, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Rogue pPlayer->SEND_POI(9789, 942.86, 7, 6, 0, "Jannok Breezesong"); - pPlayer->SEND_GOSSIP_MENU(4326,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4326, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Warrior pPlayer->SEND_POI(9821.96, 950.61, 7, 6, 0, "Kyra Windblade"); - pPlayer->SEND_GOSSIP_MENU(4327,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4327, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(9767.59, 878.81, 7, 6, 0, "Cyndra Kindwhisper"); - pPlayer->SEND_GOSSIP_MENU(4329,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4329, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Cooking pPlayer->SEND_POI(9751.19, 906.13, 7, 6, 0, "Zarrin"); - pPlayer->SEND_GOSSIP_MENU(4330,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4330, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Enchanting pPlayer->SEND_POI(10677.59, 1946.56, 7, 6, 0, "Alanna Raveneye"); - pPlayer->SEND_GOSSIP_MENU(4331,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4331, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //First Aid pPlayer->SEND_POI(9903.12, 999, 7, 6, 0, "Byancie"); - pPlayer->SEND_GOSSIP_MENU(4332,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4332, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Fishing - pPlayer->SEND_GOSSIP_MENU(4333,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4333, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Herbalism pPlayer->SEND_POI(9773.78, 875.88, 7, 6, 0, "Malorne Bladeleaf"); - pPlayer->SEND_GOSSIP_MENU(4334,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4334, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Leatherworking pPlayer->SEND_POI(10152.59, 1681.46, 7, 6, 0, "Nadyia Maneweaver"); - pPlayer->SEND_GOSSIP_MENU(4335,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4335, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Skinning pPlayer->SEND_POI(10135.59, 1673.18, 7, 6, 0, "Radnaal Maneweaver"); - pPlayer->SEND_GOSSIP_MENU(4336,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4336, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Tailoring - pPlayer->SEND_GOSSIP_MENU(4337,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4337, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_teldrassil(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_teldrassil(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_teldrassil(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_teldrassil(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_teldrassil(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_teldrassil(pPlayer, pCreature, action); break; } return true; } @@ -3516,16 +3516,16 @@ bool GossipSelect_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 * guard_teldrassil end *******************************************************/ -CreatureAI* GetAI_guard_teldrassil(Creature *_Creature) +CreatureAI* GetAI_guard_teldrassil(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_tirisfal start *******************************************************/ -bool GossipHello_guard_tirisfal(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_tirisfal(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -3533,27 +3533,27 @@ bool GossipHello_guard_tirisfal(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(4097,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4097, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank - pPlayer->SEND_GOSSIP_MENU(4074,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4074, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //bat handler - pPlayer->SEND_GOSSIP_MENU(4075,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4075, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Inn pPlayer->SEND_POI(2246.68, 241.89, 7, 6, 0, "Gallows` End Tavern"); - pPlayer->SEND_GOSSIP_MENU(4076,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4076, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Stable Master pPlayer->SEND_POI(2267.66, 319.32, 7, 6, 0, "Morganus"); - pPlayer->SEND_GOSSIP_MENU(5978,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5978, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -3561,7 +3561,7 @@ void SendDefaultMenu_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(4292,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4292, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -3576,96 +3576,96 @@ void SendDefaultMenu_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(4096,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4096, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Mage pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Cain Firesong"); - pPlayer->SEND_GOSSIP_MENU(4077,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4077, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Priest pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Dark Cleric Beryl"); - pPlayer->SEND_GOSSIP_MENU(4078,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4078, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Rogue pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Marion Call"); - pPlayer->SEND_GOSSIP_MENU(4079,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4079, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Warlock pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Rupert Boch"); - pPlayer->SEND_GOSSIP_MENU(4080,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4080, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Warrior pPlayer->SEND_POI(2256.48, 240.32, 7, 6, 0, "Austil de Mon"); - pPlayer->SEND_GOSSIP_MENU(4081,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4081, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(2263.25, 344.23, 7, 6, 0, "Carolai Anise"); - pPlayer->SEND_GOSSIP_MENU(4082,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4082, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing - pPlayer->SEND_GOSSIP_MENU(4083,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4083, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking - pPlayer->SEND_GOSSIP_MENU(4084,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4084, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(2250.35, 249.12, 7, 6, 0, "Vance Undergloom"); - pPlayer->SEND_GOSSIP_MENU(4085,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4085, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering - pPlayer->SEND_GOSSIP_MENU(4086,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4086, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(2246.68, 241.89, 7, 6, 0, "Nurse Neela"); - pPlayer->SEND_GOSSIP_MENU(4087,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4087, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(2292.37, -10.72, 7, 6, 0, "Clyde Kellen"); - pPlayer->SEND_GOSSIP_MENU(4088,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4088, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism pPlayer->SEND_POI(2268.21, 331.69, 7, 6, 0, "Faruza"); - pPlayer->SEND_GOSSIP_MENU(4089,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4089, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking pPlayer->SEND_POI(2027, 78.72, 7, 6, 0, "Shelene Rhobart"); - pPlayer->SEND_GOSSIP_MENU(4090,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4090, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Mining - pPlayer->SEND_GOSSIP_MENU(4091,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4091, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning pPlayer->SEND_POI(2027, 78.72, 7, 6, 0, "Rand Rhobart"); - pPlayer->SEND_GOSSIP_MENU(4092,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4092, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring pPlayer->SEND_POI(2160.45, 659.93, 7, 6, 0, "Bowen Brisboise"); - pPlayer->SEND_GOSSIP_MENU(4093,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4093, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_tirisfal(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_tirisfal(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_tirisfal(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_tirisfal(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_tirisfal(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_tirisfal(pPlayer, pCreature, action); break; } return true; } @@ -3674,16 +3674,16 @@ bool GossipSelect_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 se * guard_tirisfal end *******************************************************/ -CreatureAI* GetAI_guard_tirisfal(Creature *_Creature) +CreatureAI* GetAI_guard_tirisfal(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* * guard_undercity start *******************************************************/ -bool GossipHello_guard_undercity(Player* pPlayer, Creature *_Creature) +bool GossipHello_guard_undercity(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -3697,55 +3697,55 @@ bool GossipHello_guard_undercity(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(3543,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3543, pCreature->GetGUID()); return true; } -void SendDefaultMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_POI(1595.64, 232.45, 7, 6, 0, "Undercity Bank"); - pPlayer->SEND_GOSSIP_MENU(3514,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3514, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Bat handler pPlayer->SEND_POI(1565.9, 271.43, 7, 6, 0, "Undercity Bat Handler"); - pPlayer->SEND_GOSSIP_MENU(3515,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3515, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Guild master pPlayer->SEND_POI(1594.17, 205.57, 7, 6, 0, "Undercity Guild Master"); - pPlayer->SEND_GOSSIP_MENU(3516,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3516, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Inn pPlayer->SEND_POI(1639.43, 220.99, 7, 6, 0, "Undercity Inn"); - pPlayer->SEND_GOSSIP_MENU(3517,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3517, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Mailbox pPlayer->SEND_POI(1632.68, 219.4, 7, 6, 0, "Undercity Mailbox"); - pPlayer->SEND_GOSSIP_MENU(3518,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3518, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //Auction House pPlayer->SEND_POI(1647.9, 258.49, 7, 6, 0, "Undercity Auction House"); - pPlayer->SEND_GOSSIP_MENU(3519,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3519, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Zeppelin pPlayer->SEND_POI(2059, 274.86, 7, 6, 0, "Undercity Zeppelin"); - pPlayer->SEND_GOSSIP_MENU(3520,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3520, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Weapon Master pPlayer->SEND_POI(1670.31, 324.66, 7, 6, 0, "Archibald"); - pPlayer->SEND_GOSSIP_MENU(4521,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4521, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Stable master pPlayer->SEND_POI(1634.18, 226.76, 7, 6, 0, "Anya Maulray"); - pPlayer->SEND_GOSSIP_MENU(5979,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5979, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Battlemaster pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(7527,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7527, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Class trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -3753,7 +3753,7 @@ void SendDefaultMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(3542,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3542, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Profession trainer pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -3768,120 +3768,120 @@ void SendDefaultMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint3 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(3541,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3541, pCreature->GetGUID()); break; } } -void SendBattleMasterMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 action) +void SendBattleMasterMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(1329, 333.92, 7, 6, 0, "Grizzle Halfmane"); - pPlayer->SEND_GOSSIP_MENU(7525,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7525, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //AB pPlayer->SEND_POI(1283.3, 287.16, 7, 6, 0, "Sir Malory Wheeler"); - pPlayer->SEND_GOSSIP_MENU(7646,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7646, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //WSG pPlayer->SEND_POI(1265, 351.18, 7, 6, 0, "Kurden Bloodclaw"); - pPlayer->SEND_GOSSIP_MENU(7526,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7526, pCreature->GetGUID()); break; } } -void SendClassTrainerMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 action) +void SendClassTrainerMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Mage pPlayer->SEND_POI(1781, 53, 7, 6, 0, "Undercity Mage Trainers"); - pPlayer->SEND_GOSSIP_MENU(3513,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3513, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Priest pPlayer->SEND_POI(1758.33, 401.5, 7, 6, 0, "Undercity Priest Trainers"); - pPlayer->SEND_GOSSIP_MENU(3521,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3521, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Rogue pPlayer->SEND_POI(1418.56, 65, 7, 6, 0, "Undercity Rogue Trainers"); - pPlayer->SEND_GOSSIP_MENU(3524,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3524, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Warlock pPlayer->SEND_POI(1780.92, 53.16, 7, 6, 0, "Undercity Warlock Trainers"); - pPlayer->SEND_GOSSIP_MENU(3526,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3526, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Warrior pPlayer->SEND_POI(1775.59, 418.19, 7, 6, 0, "Undercity Warrior Trainers"); - pPlayer->SEND_GOSSIP_MENU(3527,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3527, pCreature->GetGUID()); break; } } -void SendProfTrainerMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 action) +void SendProfTrainerMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(1419.82, 417.19, 7, 6, 0, "The Apothecarium"); - pPlayer->SEND_GOSSIP_MENU(3528,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3528, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: //Blacksmithing pPlayer->SEND_POI(1696, 285, 7, 6, 0, "Undercity Blacksmithing Trainer"); - pPlayer->SEND_GOSSIP_MENU(3529,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3529, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Cooking pPlayer->SEND_POI(1596.34, 274.68, 7, 6, 0, "Undercity Cooking Trainer"); - pPlayer->SEND_GOSSIP_MENU(3530,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3530, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Enchanting pPlayer->SEND_POI(1488.54, 280.19, 7, 6, 0, "Undercity Enchanting Trainer"); - pPlayer->SEND_GOSSIP_MENU(3531,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3531, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: //Engineering pPlayer->SEND_POI(1408.58, 143.43, 7, 6, 0, "Undercity Engineering Trainer"); - pPlayer->SEND_GOSSIP_MENU(3532,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3532, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: //First Aid pPlayer->SEND_POI(1519.65, 167.19, 7, 6, 0, "Undercity First Aid Trainer"); - pPlayer->SEND_GOSSIP_MENU(3533,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3533, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: //Fishing pPlayer->SEND_POI(1679.9, 89, 7, 6, 0, "Undercity Fishing Trainer"); - pPlayer->SEND_GOSSIP_MENU(3534,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3534, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 8: //Herbalism pPlayer->SEND_POI(1558, 349.36, 7, 6, 0, "Undercity Herbalism Trainer"); - pPlayer->SEND_GOSSIP_MENU(3535,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3535, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: //Leatherworking pPlayer->SEND_POI(1498.76, 196.43, 7, 6, 0, "Undercity Leatherworking Trainer"); - pPlayer->SEND_GOSSIP_MENU(3536,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3536, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: //Mining pPlayer->SEND_POI(1642.88, 335.58, 7, 6, 0, "Undercity Mining Trainer"); - pPlayer->SEND_GOSSIP_MENU(3537,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3537, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: //Skinning pPlayer->SEND_POI(1498.6, 196.46, 7, 6, 0, "Undercity Skinning Trainer"); - pPlayer->SEND_GOSSIP_MENU(3538,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3538, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: //Tailoring pPlayer->SEND_POI(1689.55, 193, 7, 6, 0, "Undercity Tailoring Trainer"); - pPlayer->SEND_GOSSIP_MENU(3539,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3539, pCreature->GetGUID()); break; } } -bool GossipSelect_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (sender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_undercity(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_undercity(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_undercity(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_undercity(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_undercity(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_undercity(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_undercity(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_undercity(pPlayer, pCreature, action); break; } return true; } @@ -3890,9 +3890,9 @@ bool GossipSelect_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 s * guard_undercity end *******************************************************/ -CreatureAI* GetAI_guard_undercity(Creature *_Creature) +CreatureAI* GetAI_guard_undercity(Creature* pCreature) { - return new guardAI (_Creature); + return new guardAI (pCreature); } /******************************************************* diff --git a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp index 3cba528673e..be884b828d3 100644 --- a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp +++ b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp @@ -47,10 +47,10 @@ bool isEventActive() return false; } -bool GossipHello_npc_innkeeper(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_innkeeper(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (isEventActive()&& !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID())) { @@ -76,12 +76,12 @@ bool GossipHello_npc_innkeeper(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID); } - pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID()); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && isEventActive() && !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID())) { diff --git a/src/bindings/scripts/scripts/npc/npc_professions.cpp b/src/bindings/scripts/scripts/npc/npc_professions.cpp index 30da0ff3963..b1727a2170a 100644 --- a/src/bindings/scripts/scripts/npc/npc_professions.cpp +++ b/src/bindings/scripts/scripts/npc/npc_professions.cpp @@ -350,16 +350,16 @@ bool HasAlchemySpell(Player* pPlayer) return false; } -bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - if (_Creature->isVendor()) + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (pCreature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (_Creature->isTrainer()) + if (pCreature->isTrainer()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetBaseSkillValue(SKILL_ALCHEMY)>=350 && pPlayer->getLevel() > 67) { @@ -389,19 +389,19 @@ bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature *_Creature) } } - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action) +void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action) { switch(action) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(_Creature->GetGUID()); + pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); break; //Learn Alchemy case GOSSIP_ACTION_INFO_DEF + 1: @@ -410,7 +410,7 @@ void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint3 pPlayer->CastSpell(pPlayer, S_LEARN_TRANSMUTE, true); pPlayer->ModifyMoney(-DoLearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 2: @@ -419,7 +419,7 @@ void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint3 pPlayer->CastSpell(pPlayer, S_LEARN_ELIXIR, true); pPlayer->ModifyMoney(-DoLearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 3: @@ -428,100 +428,100 @@ void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint3 pPlayer->CastSpell(pPlayer, S_LEARN_POTION, true); pPlayer->ModifyMoney(-DoLearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; //Unlearn Alchemy case GOSSIP_ACTION_INFO_DEF + 4: if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer)) { - _Creature->CastSpell(pPlayer, S_UNLEARN_TRANSMUTE, true); + pCreature->CastSpell(pPlayer, S_UNLEARN_TRANSMUTE, true); pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 5: if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer)) { - _Creature->CastSpell(pPlayer, S_UNLEARN_ELIXIR, true); + pCreature->CastSpell(pPlayer, S_UNLEARN_ELIXIR, true); pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 6: if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer)) { - _Creature->CastSpell(pPlayer, S_UNLEARN_POTION, true); + pCreature->CastSpell(pPlayer, S_UNLEARN_POTION, true); pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; } } -void SendConfirmLearn_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action) +void SendConfirmLearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action) { if (action) { - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 22427: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 19052: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_CHECK, action); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 17909: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_CHECK, action); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; } } } -void SendConfirmUnlearn_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action) +void SendConfirmUnlearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action) { if (action) { - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 22427: //Zarevhi pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 19052: //Lorokeem pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 17909: //Lauranna Thar'well pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; } } } -bool GossipSelect_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(sender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_alchemy(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_alchemy(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_alchemy(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_alchemy(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_alchemy(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_alchemy(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_alchemy(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_alchemy(pPlayer, pCreature, action); break; } return true; } @@ -537,16 +537,16 @@ bool HasWeaponSub(Player* pPlayer) return false; } -bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - if (_Creature->isVendor()) + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (pCreature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (_Creature->isTrainer()) + if (pCreature->isTrainer()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); //WEAPONSMITH & ARMORSMITH if (pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING)>=225) { @@ -597,19 +597,19 @@ bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature) } } - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action) +void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action) { switch(action) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(_Creature->GetGUID()); + pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); break; //Learn Armor/Weapon case GOSSIP_ACTION_INFO_DEF + 1: @@ -633,7 +633,7 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui if (HasWeaponSub(pPlayer)) { //unknown textID (TALK_MUST_UNLEARN_WEAPON) - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); } else if (EquippedOk(pPlayer,S_UNLEARN_WEAPON)) { @@ -642,10 +642,10 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui pPlayer->CastSpell(pPlayer, S_UNLEARN_WEAPON, true); ProfessionUnlearnSpells(pPlayer, S_UNLEARN_WEAPON); pPlayer->ModifyMoney(-DoLowUnlearnCost(pPlayer)); - _Creature->CastSpell(pPlayer, S_REP_ARMOR, true); + pCreature->CastSpell(pPlayer, S_REP_ARMOR, true); pPlayer->CLOSE_GOSSIP_MENU(); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else { @@ -661,9 +661,9 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui pPlayer->CastSpell(pPlayer, S_UNLEARN_ARMOR, true); ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ARMOR); pPlayer->ModifyMoney(-DoLowUnlearnCost(pPlayer)); - _Creature->CastSpell(pPlayer, S_REP_WEAPON, true); + pCreature->CastSpell(pPlayer, S_REP_WEAPON, true); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -691,7 +691,7 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui ProfessionUnlearnSpells(pPlayer, S_UNLEARN_HAMMER); pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -705,7 +705,7 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui ProfessionUnlearnSpells(pPlayer, S_UNLEARN_AXE); pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -719,7 +719,7 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SWORD); pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -727,37 +727,37 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, ui } } -void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action) +void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action) { if (action) { - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 11191: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, action); //unknown textID (TALK_HAMMER_LEARN) - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11192: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, action); //unknown textID (TALK_AXE_LEARN) - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11193: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, action); //unknown textID (TALK_SWORD_LEARN) - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; } } } -void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action) +void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action) { if (action) { - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 11146: //Ironus Coldsteel @@ -766,47 +766,47 @@ void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature case 11177: //Okothos Ironrager pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer),false); //unknown textID (TALK_UNLEARN_AXEORWEAPON) - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11191: pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID (TALK_HAMMER_UNLEARN) - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11192: pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID (TALK_AXE_UNLEARN) - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11193: pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID (TALK_SWORD_UNLEARN) - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; } } } -bool GossipSelect_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(sender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_blacksmith(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_blacksmith(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_blacksmith(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_blacksmith(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_blacksmith(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_blacksmith(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, action); break; } return true; } -/*bool QuestComplete_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, Quest const *_Quest) +/*bool QuestComplete_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, Quest const *_Quest) { if ((_Quest->GetQuestId() == 5283) || (_Quest->GetQuestId() == 5301)) //armorsmith - _Creature->CastSpell(pPlayer, 17451, true); + pCreature->CastSpell(pPlayer, 17451, true); if ((_Quest->GetQuestId() == 5284) || (_Quest->GetQuestId() == 5302)) //weaponsmith - _Creature->CastSpell(pPlayer, 17452, true); + pCreature->CastSpell(pPlayer, 17452, true); return true; }*/ @@ -947,16 +947,16 @@ bool GossipSelect_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreat # start menues leatherworking ###*/ -bool GossipHello_npc_prof_leather(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_prof_leather(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - if (_Creature->isVendor()) + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (pCreature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (_Creature->isTrainer()) + if (pCreature->isTrainer()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); if (pPlayer->HasSkill(SKILL_LEATHERWORKING) && pPlayer->GetBaseSkillValue(SKILL_LEATHERWORKING)>=250 && pPlayer->getLevel() > 49) { @@ -980,19 +980,19 @@ bool GossipHello_npc_prof_leather(Player* pPlayer, Creature *_Creature) } } - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 action) +void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 action) { switch(action) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(_Creature->GetGUID()); + pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); break; //Unlearn Leather case GOSSIP_ACTION_INFO_DEF + 1: @@ -1004,7 +1004,7 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint3 ProfessionUnlearnSpells(pPlayer, S_UNLEARN_DRAGON); pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -1018,7 +1018,7 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint3 ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ELEMENTAL); pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -1032,7 +1032,7 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint3 ProfessionUnlearnSpells(pPlayer, S_UNLEARN_TRIBAL); pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -1040,42 +1040,42 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint3 } } -void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 action) +void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 action) { if (action) { - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 7866: //Peter Galen case 7867: //Thorkaf Dragoneye pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 7868: //Sarah Tanner case 7869: //Brumn Winterhoof pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 7870: //Caryssia Moonhunter case 7871: //Se'Jib pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; } } } -bool GossipSelect_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(sender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_leather(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_leather(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_leather(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_leather(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_leather(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_leather(pPlayer, pCreature, action); break; } return true; } @@ -1091,16 +1091,16 @@ bool HasTailorSpell(Player* pPlayer) return false; } -bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - if (_Creature->isVendor()) + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (pCreature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (_Creature->isTrainer()) + if (pCreature->isTrainer()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); //TAILORING SPEC if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING)>=350 && pPlayer->getLevel() > 59) { @@ -1130,19 +1130,19 @@ bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature *_Creature) } } - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action) +void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action) { switch(action) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(_Creature->GetGUID()); + pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); break; //Learn Tailor case GOSSIP_ACTION_INFO_DEF + 1: @@ -1151,7 +1151,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 pPlayer->CastSpell(pPlayer, S_LEARN_SPELLFIRE, true); pPlayer->ModifyMoney(-DoLearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 2: @@ -1160,7 +1160,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 pPlayer->CastSpell(pPlayer, S_LEARN_MOONCLOTH, true); pPlayer->ModifyMoney(-DoLearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 3: @@ -1169,7 +1169,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 pPlayer->CastSpell(pPlayer, S_LEARN_SHADOWEAVE, true); pPlayer->ModifyMoney(-DoLearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; //Unlearn Tailor @@ -1182,7 +1182,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SPELLFIRE); pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -1196,7 +1196,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 ProfessionUnlearnSpells(pPlayer, S_UNLEARN_MOONCLOTH); pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -1210,7 +1210,7 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SHADOWEAVE); pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer)); } else - pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0); + pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); pPlayer->CLOSE_GOSSIP_MENU(); @@ -1218,66 +1218,66 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 } } -void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action) +void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action) { if (action) { - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 22213: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 22208: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 22212: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; } } } -void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action) +void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action) { if (action) { - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 22213: //Gidge Spellweaver pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 22208: //Nasmara Moonsong pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 22212: //Andrion Darkspinner pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; } } } -bool GossipSelect_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(sender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_tailor(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_tailor(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(pPlayer, _Creature, action); break; - case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_tailor(pPlayer, _Creature, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_tailor(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_tailor(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_tailor(pPlayer, pCreature, action); break; } return true; } diff --git a/src/bindings/scripts/scripts/npc/npc_taxi.cpp b/src/bindings/scripts/scripts/npc/npc_taxi.cpp index 2d2ed6722d1..c6adcb08c5f 100644 --- a/src/bindings/scripts/scripts/npc/npc_taxi.cpp +++ b/src/bindings/scripts/scripts/npc/npc_taxi.cpp @@ -24,12 +24,12 @@ EndScriptData #include "precompiled.h" -bool GossipHello_npc_taxi(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_taxi(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - switch(_Creature->GetEntry()) { + switch(pCreature->GetEntry()) { case 17435: // Azuremyst Isle - Susurrus if (pPlayer->HasItemCount(23843,1,true)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -129,11 +129,11 @@ bool GossipHello_npc_taxi(Player* pPlayer, Creature *_Creature) break; } - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(action) { case GOSSIP_ACTION_INFO_DEF: @@ -147,7 +147,7 @@ bool GossipSelect_npc_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, break; case GOSSIP_ACTION_INFO_DEF + 2: if (!pPlayer->HasItemCount(25853,1)) { - pPlayer->SEND_GOSSIP_MENU(9780, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9780, pCreature->GetGUID()); } else { pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->ActivateTaxiPathTo(534); //TaxiPath 534 diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index afce32ec7a8..1764708d0e3 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -313,23 +313,23 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_chicken_cluck(Creature *_Creature) +CreatureAI* GetAI_npc_chicken_cluck(Creature* pCreature) { - return new npc_chicken_cluckAI(_Creature); + return new npc_chicken_cluckAI(pCreature); } -bool QuestAccept_npc_chicken_cluck(Player* pPlayer, Creature *_Creature, const Quest *_Quest) +bool QuestAccept_npc_chicken_cluck(Player* pPlayer, Creature* pCreature, const Quest *_Quest) { if (_Quest->GetQuestId() == QUEST_CLUCK) - CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset(); + CAST_AI(npc_chicken_cluckAI, pCreature->AI())->Reset(); return true; } -bool QuestComplete_npc_chicken_cluck(Player* pPlayer, Creature *_Creature, const Quest *_Quest) +bool QuestComplete_npc_chicken_cluck(Player* pPlayer, Creature* pCreature, const Quest *_Quest) { if (_Quest->GetQuestId() == QUEST_CLUCK) - CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset(); + CAST_AI(npc_chicken_cluckAI, pCreature->AI())->Reset(); return true; } @@ -406,9 +406,9 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_dancing_flames(Creature *_Creature) +CreatureAI* GetAI_npc_dancing_flames(Creature* pCreature) { - return new npc_dancing_flamesAI(_Creature); + return new npc_dancing_flamesAI(pCreature); } /*###### @@ -637,9 +637,9 @@ struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_injured_patient(Creature *_Creature) +CreatureAI* GetAI_npc_injured_patient(Creature* pCreature) { - return new npc_injured_patientAI (_Creature); + return new npc_injured_patientAI (pCreature); } /* @@ -791,9 +791,9 @@ bool QuestAccept_npc_doctor(Player* pPlayer, Creature *creature, Quest const *qu return true; } -CreatureAI* GetAI_npc_doctor(Creature *_Creature) +CreatureAI* GetAI_npc_doctor(Creature* pCreature) { - return new npc_doctorAI (_Creature); + return new npc_doctorAI (pCreature); } /*###### @@ -1044,9 +1044,9 @@ struct TRINITY_DLL_DECL npc_guardianAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_guardian(Creature *_Creature) +CreatureAI* GetAI_npc_guardian(Creature* pCreature) { - return new npc_guardianAI (_Creature); + return new npc_guardianAI (pCreature); } /*###### @@ -1091,14 +1091,14 @@ bool GossipSelect_npc_kingdom_of_dalaran_quests(Player* pPlayer, Creature* pCrea ## npc_mount_vendor ######*/ -bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); bool canBuy; canBuy = false; - uint32 vendor = _Creature->GetEntry(); + uint32 vendor = pCreature->GetEntry(); uint8 race = pPlayer->getRace(); switch (vendor) @@ -1108,69 +1108,69 @@ bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature *_Creature) case 2357: //Merideth Carlson case 4885: //Gregor MacVince if (pPlayer->GetReputationRank(72) != REP_EXALTED && race != RACE_HUMAN) - pPlayer->SEND_GOSSIP_MENU(5855, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5855, pCreature->GetGUID()); else canBuy = true; break; case 1261: //Veron Amberstill if (pPlayer->GetReputationRank(47) != REP_EXALTED && race != RACE_DWARF) - pPlayer->SEND_GOSSIP_MENU(5856, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5856, pCreature->GetGUID()); else canBuy = true; break; case 3362: //Ogunaro Wolfrunner if (pPlayer->GetReputationRank(76) != REP_EXALTED && race != RACE_ORC) - pPlayer->SEND_GOSSIP_MENU(5841, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5841, pCreature->GetGUID()); else canBuy = true; break; case 3685: //Harb Clawhoof if (pPlayer->GetReputationRank(81) != REP_EXALTED && race != RACE_TAUREN) - pPlayer->SEND_GOSSIP_MENU(5843, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5843, pCreature->GetGUID()); else canBuy = true; break; case 4730: //Lelanai if (pPlayer->GetReputationRank(69) != REP_EXALTED && race != RACE_NIGHTELF) - pPlayer->SEND_GOSSIP_MENU(5844, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5844, pCreature->GetGUID()); else canBuy = true; break; case 4731: //Zachariah Post if (pPlayer->GetReputationRank(68) != REP_EXALTED && race != RACE_UNDEAD_PLAYER) - pPlayer->SEND_GOSSIP_MENU(5840, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5840, pCreature->GetGUID()); else canBuy = true; break; case 7952: //Zjolnir if (pPlayer->GetReputationRank(530) != REP_EXALTED && race != RACE_TROLL) - pPlayer->SEND_GOSSIP_MENU(5842, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5842, pCreature->GetGUID()); else canBuy = true; break; case 7955: //Milli Featherwhistle if (pPlayer->GetReputationRank(54) != REP_EXALTED && race != RACE_GNOME) - pPlayer->SEND_GOSSIP_MENU(5857, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5857, pCreature->GetGUID()); else canBuy = true; break; case 16264: //Winaestra if (pPlayer->GetReputationRank(911) != REP_EXALTED && race != RACE_BLOODELF) - pPlayer->SEND_GOSSIP_MENU(10305, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10305, pCreature->GetGUID()); else canBuy = true; break; case 17584: //Torallius the Pack Handler if (pPlayer->GetReputationRank(930) != REP_EXALTED && race != RACE_DRAENEI) - pPlayer->SEND_GOSSIP_MENU(10239, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10239, pCreature->GetGUID()); else canBuy = true; break; } if (canBuy) { - if (_Creature->isVendor()) + if (pCreature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); } return true; } -bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -1179,28 +1179,28 @@ bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature *_Creature, uint32 ## npc_rogue_trainer ######*/ -bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isTrainer()) + if (pCreature->isTrainer()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); - if (_Creature->isCanTrainingAndResetTalentsOf(pPlayer)) + if (pCreature->isCanTrainingAndResetTalentsOf(pPlayer)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "I wish to unlearn my talents", GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS); if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Take the letter>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(5996, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5996, pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(action) { @@ -1209,11 +1209,11 @@ bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature *_Creature, uint32 pPlayer->CastSpell(pPlayer,21100,false); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(_Creature->GetGUID()); + pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); break; case GOSSIP_OPTION_UNLEARNTALENTS: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->SendTalentWipeConfirm(_Creature->GetGUID()); + pPlayer->SendTalentWipeConfirm(pCreature->GetGUID()); break; } return true; @@ -1233,10 +1233,10 @@ bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature *_Creature, uint32 #define SPELL_AGI 23736 //agi #define SPELL_FORTUNE 23765 //faire fortune -bool GossipHello_npc_sayge(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_sayge(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->HasSpellCooldown(SPELL_INT) || pPlayer->HasSpellCooldown(SPELL_ARM) || @@ -1246,17 +1246,17 @@ bool GossipHello_npc_sayge(Player* pPlayer, Creature *_Creature) pPlayer->HasSpellCooldown(SPELL_AGI) || pPlayer->HasSpellCooldown(SPELL_STM) || pPlayer->HasSpellCooldown(SPELL_SPI)) - pPlayer->SEND_GOSSIP_MENU(7393, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7393, pCreature->GetGUID()); else { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(7339, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7339, pCreature->GetGUID()); } return true; } -void SendAction_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 action) +void SendAction_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 action) { switch(action) { @@ -1265,89 +1265,89 @@ void SendAction_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 action) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Turn him over to liege", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confiscate the corn", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let him go and have the corn", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(7340, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7340, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painfully", GOSSIP_SENDER_MAIN+1, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painlessly", GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let your friend go", GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(7341, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7341, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confront the diplomat", GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Show not so quiet defiance", GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Remain quiet", GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(7361, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7361, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speak against your brother openly", GOSSIP_SENDER_MAIN+6, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Help your brother in", GOSSIP_SENDER_MAIN+7, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Keep your brother out without letting him know", GOSSIP_SENDER_MAIN+8, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(7362, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7362, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, keep gold", GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, share the gold", GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let the knight take credit", GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(7363, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7363, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thanks", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(7364, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7364, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: - _Creature->CastSpell(pPlayer, SPELL_FORTUNE, false); - pPlayer->SEND_GOSSIP_MENU(7365, _Creature->GetGUID()); + pCreature->CastSpell(pPlayer, SPELL_FORTUNE, false); + pPlayer->SEND_GOSSIP_MENU(7365, pCreature->GetGUID()); break; } } -bool GossipSelect_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(sender) { case GOSSIP_SENDER_MAIN: - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; case GOSSIP_SENDER_MAIN+1: - _Creature->CastSpell(pPlayer, SPELL_DMG, false); + pCreature->CastSpell(pPlayer, SPELL_DMG, false); pPlayer->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; case GOSSIP_SENDER_MAIN+2: - _Creature->CastSpell(pPlayer, SPELL_RES, false); + pCreature->CastSpell(pPlayer, SPELL_RES, false); pPlayer->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; case GOSSIP_SENDER_MAIN+3: - _Creature->CastSpell(pPlayer, SPELL_ARM, false); + pCreature->CastSpell(pPlayer, SPELL_ARM, false); pPlayer->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; case GOSSIP_SENDER_MAIN+4: - _Creature->CastSpell(pPlayer, SPELL_SPI, false); + pCreature->CastSpell(pPlayer, SPELL_SPI, false); pPlayer->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; case GOSSIP_SENDER_MAIN+5: - _Creature->CastSpell(pPlayer, SPELL_INT, false); + pCreature->CastSpell(pPlayer, SPELL_INT, false); pPlayer->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; case GOSSIP_SENDER_MAIN+6: - _Creature->CastSpell(pPlayer, SPELL_STM, false); + pCreature->CastSpell(pPlayer, SPELL_STM, false); pPlayer->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; case GOSSIP_SENDER_MAIN+7: - _Creature->CastSpell(pPlayer, SPELL_STR, false); + pCreature->CastSpell(pPlayer, SPELL_STR, false); pPlayer->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; case GOSSIP_SENDER_MAIN+8: - _Creature->CastSpell(pPlayer, SPELL_AGI, false); + pCreature->CastSpell(pPlayer, SPELL_AGI, false); pPlayer->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, _Creature, action); + SendAction_npc_sayge(pPlayer, pCreature, action); break; } return true; @@ -1376,9 +1376,9 @@ struct TRINITY_DLL_DECL npc_steam_tonkAI : public ScriptedAI }; -CreatureAI* GetAI_npc_steam_tonk(Creature *_Creature) +CreatureAI* GetAI_npc_steam_tonk(Creature* pCreature) { - return new npc_steam_tonkAI(_Creature); + return new npc_steam_tonkAI(pCreature); } #define SPELL_TONK_MINE_DETONATE 25099 @@ -1412,16 +1412,16 @@ struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_tonk_mine(Creature *_Creature) +CreatureAI* GetAI_npc_tonk_mine(Creature* pCreature) { - return new npc_tonk_mineAI(_Creature); + return new npc_tonk_mineAI(pCreature); } /*#### ## npc_winter_reveler ####*/ -bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature *_Creature, uint32 emote) +bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature* pCreature, uint32 emote) { //TODO: check auralist. if (pPlayer->HasAura(26218)) @@ -1429,13 +1429,13 @@ bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature *_Creature, uint3 if (emote == TEXTEMOTE_KISS) { - _Creature->CastSpell(_Creature, 26218, false); + pCreature->CastSpell(pCreature, 26218, false); pPlayer->CastSpell(pPlayer, 26218, false); switch(rand()%3) { - case 0: _Creature->CastSpell(pPlayer, 26207, false); break; - case 1: _Creature->CastSpell(pPlayer, 26206, false); break; - case 2: _Creature->CastSpell(pPlayer, 45036, false); break; + case 0: pCreature->CastSpell(pPlayer, 26207, false); break; + case 1: pCreature->CastSpell(pPlayer, 26206, false); break; + case 2: pCreature->CastSpell(pPlayer, 45036, false); break; } } return true; @@ -1445,10 +1445,10 @@ bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature *_Creature, uint3 ## npc_brewfest_reveler ####*/ -bool ReceiveEmote_npc_brewfest_reveler(Player* pPlayer, Creature *_Creature, uint32 emote) +bool ReceiveEmote_npc_brewfest_reveler(Player* pPlayer, Creature* pCreature, uint32 emote) { if (emote == TEXTEMOTE_DANCE) - _Creature->CastSpell(pPlayer, 41586, false); + pCreature->CastSpell(pPlayer, 41586, false); return true; } @@ -1570,9 +1570,9 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_snake_trap_serpents(Creature *_Creature) +CreatureAI* GetAI_npc_snake_trap_serpents(Creature* pCreature) { - return new npc_snake_trap_serpentsAI(_Creature); + return new npc_snake_trap_serpentsAI(pCreature); } struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI @@ -1640,9 +1640,9 @@ struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_mojo(Creature *_Creature) +CreatureAI* GetAI_mob_mojo(Creature* pCreature) { - return new mob_mojoAI (_Creature); + return new mob_mojoAI (pCreature); } struct TRINITY_DLL_DECL npc_mirror_image : SpellCasterAI @@ -1680,9 +1680,9 @@ struct TRINITY_DLL_DECL npc_mirror_image : SpellCasterAI } }; -CreatureAI* GetAI_npc_mirror_image(Creature *_Creature) +CreatureAI* GetAI_npc_mirror_image(Creature* pCreature) { - return new npc_mirror_image (_Creature); + return new npc_mirror_image (pCreature); } //TODO: 30% Attackdamage check for Lightwell @@ -1714,9 +1714,9 @@ struct TRINITY_DLL_DECL npc_lightwellAI : public PassiveAI */ }; -CreatureAI* GetAI_npc_lightwellAI(Creature *_Creature) +CreatureAI* GetAI_npc_lightwellAI(Creature* pCreature) { - return new npc_lightwellAI (_Creature); + return new npc_lightwellAI (pCreature); } struct TRINITY_DLL_DECL npc_training_dummy : Scripted_NoMovementAI @@ -1756,9 +1756,9 @@ struct TRINITY_DLL_DECL npc_training_dummy : Scripted_NoMovementAI void MoveInLineOfSight(Unit *who){return;} }; -CreatureAI* GetAI_npc_training_dummy(Creature *_Creature) +CreatureAI* GetAI_npc_training_dummy(Creature* pCreature) { - return new npc_training_dummy (_Creature); + return new npc_training_dummy (pCreature); } void AddSC_npcs_special() diff --git a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp index 93e3c90a22e..2987fbe169a 100644 --- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp +++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp @@ -123,9 +123,9 @@ bool QuestAccept_npc_professor_phizzlethorpe(Player* pPlayer, Creature* creature return true; } -CreatureAI* GetAI_npc_professor_phizzlethorpeAI(Creature *_Creature) +CreatureAI* GetAI_npc_professor_phizzlethorpeAI(Creature* pCreature) { - npc_professor_phizzlethorpeAI* professor_phizzlethorpeAI = new npc_professor_phizzlethorpeAI(_Creature); + npc_professor_phizzlethorpeAI* professor_phizzlethorpeAI = new npc_professor_phizzlethorpeAI(pCreature); professor_phizzlethorpeAI->FillPointMovementListForCreature(); diff --git a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp index 5ae9a4487bd..046ed4ea4b9 100644 --- a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp +++ b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp @@ -249,9 +249,9 @@ bool QuestAccept_npc_ruul_snowhoof(Player* pPlayer, Creature* creature, Quest co return true; } -CreatureAI* GetAI_npc_ruul_snowhoofAI(Creature *_Creature) +CreatureAI* GetAI_npc_ruul_snowhoofAI(Creature* pCreature) { - npc_ruul_snowhoofAI* ruul_snowhoofAI = new npc_ruul_snowhoofAI(_Creature); + npc_ruul_snowhoofAI* ruul_snowhoofAI = new npc_ruul_snowhoofAI(pCreature); ruul_snowhoofAI->FillPointMovementListForCreature(); diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp index 5ae5921409b..414804a6576 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp @@ -111,9 +111,9 @@ struct TRINITY_DLL_DECL mob_stolen_soulAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_stolen_soul(Creature *_Creature) +CreatureAI* GetAI_mob_stolen_soul(Creature* pCreature) { - return new mob_stolen_soulAI (_Creature); + return new mob_stolen_soulAI (pCreature); } #define SAY_INTRO -1558000 @@ -293,9 +293,9 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_exarch_maladaar(Creature *_Creature) +CreatureAI* GetAI_boss_exarch_maladaar(Creature* pCreature) { - return new boss_exarch_maladaarAI (_Creature); + return new boss_exarch_maladaarAI (pCreature); } #define SPELL_AV_MORTAL_STRIKE 16856 @@ -331,9 +331,9 @@ struct TRINITY_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_avatar_of_martyred(Creature *_Creature) +CreatureAI* GetAI_mob_avatar_of_martyred(Creature* pCreature) { - return new mob_avatar_of_martyredAI (_Creature); + return new mob_avatar_of_martyredAI (pCreature); } void AddSC_boss_exarch_maladaar() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index fb47de3bb20..41ca811c56a 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -143,9 +143,9 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_shirrak_the_dead_watcher(Creature *_Creature) +CreatureAI* GetAI_boss_shirrak_the_dead_watcher(Creature* pCreature) { - return new boss_shirrak_the_dead_watcherAI (_Creature); + return new boss_shirrak_the_dead_watcherAI (pCreature); } struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI @@ -189,9 +189,9 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_focus_fire(Creature *_Creature) +CreatureAI* GetAI_mob_focus_fire(Creature* pCreature) { - return new mob_focus_fireAI (_Creature); + return new mob_focus_fireAI (pCreature); } void AddSC_boss_shirrak_the_dead_watcher() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index a434950acc1..dcaaefee8c2 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -210,9 +210,9 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_nexusprince_shaffar(Creature *_Creature) +CreatureAI* GetAI_boss_nexusprince_shaffar(Creature* pCreature) { - return new boss_nexusprince_shaffarAI (_Creature); + return new boss_nexusprince_shaffarAI (pCreature); } enum @@ -297,9 +297,9 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_ethereal_beacon(Creature *_Creature) +CreatureAI* GetAI_mob_ethereal_beacon(Creature* pCreature) { - return new mob_ethereal_beaconAI (_Creature); + return new mob_ethereal_beaconAI (pCreature); } enum @@ -342,9 +342,9 @@ struct TRINITY_DLL_DECL mob_ethereal_apprenticeAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_ethereal_apprentice(Creature *_Creature) +CreatureAI* GetAI_mob_ethereal_apprentice(Creature* pCreature) { - return new mob_ethereal_apprenticeAI (_Creature); + return new mob_ethereal_apprenticeAI (pCreature); } void AddSC_boss_nexusprince_shaffar() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp index 634b529f6d2..77e1c535340 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp @@ -122,9 +122,9 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_pandemonius(Creature *_Creature) +CreatureAI* GetAI_boss_pandemonius(Creature* pCreature) { - return new boss_pandemoniusAI (_Creature); + return new boss_pandemoniusAI (pCreature); } void AddSC_boss_pandemonius() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp index 4576fefc24e..00e43fa257d 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -196,9 +196,9 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_darkweaver_syth(Creature *_Creature) +CreatureAI* GetAI_boss_darkweaver_syth(Creature* pCreature) { - return new boss_darkweaver_sythAI (_Creature); + return new boss_darkweaver_sythAI (pCreature); } /* ELEMENTALS */ @@ -249,9 +249,9 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_syth_fire(Creature *_Creature) +CreatureAI* GetAI_mob_syth_fire(Creature* pCreature) { - return new mob_syth_fireAI (_Creature); + return new mob_syth_fireAI (pCreature); } struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI @@ -300,9 +300,9 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_syth_arcane(Creature *_Creature) +CreatureAI* GetAI_mob_syth_arcane(Creature* pCreature) { - return new mob_syth_arcaneAI (_Creature); + return new mob_syth_arcaneAI (pCreature); } struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI @@ -351,9 +351,9 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_syth_frost(Creature *_Creature) +CreatureAI* GetAI_mob_syth_frost(Creature* pCreature) { - return new mob_syth_frostAI (_Creature); + return new mob_syth_frostAI (pCreature); } struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI @@ -402,9 +402,9 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_syth_shadow(Creature *_Creature) +CreatureAI* GetAI_mob_syth_shadow(Creature* pCreature) { - return new mob_syth_shadowAI (_Creature); + return new mob_syth_shadowAI (pCreature); } void AddSC_boss_darkweaver_syth() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index 2aba0f74e5a..7830fc10645 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -205,9 +205,9 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_talon_king_ikiss(Creature *_Creature) +CreatureAI* GetAI_boss_talon_king_ikiss(Creature* pCreature) { - return new boss_talon_king_ikissAI (_Creature); + return new boss_talon_king_ikissAI (pCreature); } void AddSC_boss_talon_king_ikiss() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index b2401089abe..70e37b48504 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -197,9 +197,9 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_ambassador_hellmaw(Creature *_Creature) +CreatureAI* GetAI_boss_ambassador_hellmaw(Creature* pCreature) { - return new boss_ambassador_hellmawAI (_Creature); + return new boss_ambassador_hellmawAI (pCreature); } void AddSC_boss_ambassador_hellmaw() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index 2d2e40b7733..73374c08f8c 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -161,9 +161,9 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_blackheart_the_inciter(Creature *_Creature) +CreatureAI* GetAI_boss_blackheart_the_inciter(Creature* pCreature) { - return new boss_blackheart_the_inciterAI (_Creature); + return new boss_blackheart_the_inciterAI (pCreature); } void AddSC_boss_blackheart_the_inciter() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index 021dc59f810..0cc6255f3cf 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -117,9 +117,9 @@ struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI }else move -= diff; } }; -CreatureAI* GetAI_mob_voidtraveler(Creature *_Creature) +CreatureAI* GetAI_mob_voidtraveler(Creature* pCreature) { - return new mob_voidtravelerAI (_Creature); + return new mob_voidtravelerAI (pCreature); } struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI @@ -300,9 +300,9 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_grandmaster_vorpil(Creature *_Creature) +CreatureAI* GetAI_boss_grandmaster_vorpil(Creature* pCreature) { - return new boss_grandmaster_vorpilAI (_Creature); + return new boss_grandmaster_vorpilAI (pCreature); } void AddSC_boss_grandmaster_vorpil() diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp index 3fb42763030..259f6091af6 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp @@ -191,9 +191,9 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_murmur(Creature *_Creature) +CreatureAI* GetAI_boss_murmur(Creature* pCreature) { - return new boss_murmurAI (_Creature); + return new boss_murmurAI (pCreature); } void AddSC_boss_murmur() diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp index 4c830237099..3538aee0c5b 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp @@ -63,9 +63,9 @@ struct TRINITY_DLL_DECL boss_amanitarAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_amanitar(Creature *_Creature) +CreatureAI* GetAI_boss_amanitar(Creature* pCreature) { - return new boss_amanitarAI (_Creature); + return new boss_amanitarAI (pCreature); } void AddSC_boss_amanitar() diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index 11d98961bb4..129f7b34db6 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -194,9 +194,9 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_elder_nadox(Creature *_Creature) +CreatureAI* GetAI_boss_elder_nadox(Creature* pCreature) { - return new boss_elder_nadoxAI(_Creature); + return new boss_elder_nadoxAI(pCreature); } #define SPELL_SPRINT 56354 @@ -253,9 +253,9 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_ahnkahar_nerubian(Creature *_Creature) +CreatureAI* GetAI_mob_ahnkahar_nerubian(Creature* pCreature) { - return new mob_ahnkahar_nerubianAI(_Creature); + return new mob_ahnkahar_nerubianAI(pCreature); } void AddSC_boss_elder_nadox() diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index 23294ea0cee..820c260801e 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -95,9 +95,9 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_volazj(Creature *_Creature) +CreatureAI* GetAI_boss_volazj(Creature* pCreature) { - return new boss_volazjAI (_Creature); + return new boss_volazjAI (pCreature); } void AddSC_boss_volazj() diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 25e0921b495..47a7d79e87b 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -93,9 +93,9 @@ struct TRINITY_DLL_DECL boss_jedogaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_jedoga(Creature *_Creature) +CreatureAI* GetAI_boss_jedoga(Creature* pCreature) { - return new boss_jedogaAI (_Creature); + return new boss_jedogaAI (pCreature); } void AddSC_boss_jedoga() diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index e9fcb7764ff..cb34d8919d7 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -93,9 +93,9 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_taldaram(Creature *_Creature) +CreatureAI* GetAI_boss_taldaram(Creature* pCreature) { - return new boss_taldaramAI (_Creature); + return new boss_taldaramAI (pCreature); } void AddSC_boss_taldaram() diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp index 66457657bbb..b4717824443 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp @@ -96,9 +96,9 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_anub_arak(Creature *_Creature) +CreatureAI* GetAI_boss_anub_arak(Creature* pCreature) { - return new boss_anub_arakAI (_Creature); + return new boss_anub_arakAI (pCreature); } void AddSC_boss_anub_arak() diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp index 5cc93e293c3..fa85563a2e7 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp @@ -98,9 +98,9 @@ struct TRINITY_DLL_DECL boss_hadronoxAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_hadronox(Creature *_Creature) +CreatureAI* GetAI_boss_hadronox(Creature* pCreature) { - return new boss_hadronoxAI (_Creature); + return new boss_hadronoxAI (pCreature); } void AddSC_boss_hadronox() diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index cf117ba4f95..3e0d3e97a51 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -99,9 +99,9 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_krik_thir(Creature *_Creature) +CreatureAI* GetAI_boss_krik_thir(Creature* pCreature) { - return new boss_krik_thirAI (_Creature); + return new boss_krik_thirAI (pCreature); } void AddSC_boss_krik_thir() diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp index c9fabd65631..027936c5437 100644 --- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp @@ -88,19 +88,19 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_mobs_spitelashes(Creature *_Creature) +CreatureAI* GetAI_mobs_spitelashes(Creature* pCreature) { - return new mobs_spitelashesAI (_Creature); + return new mobs_spitelashesAI (pCreature); } /*###### ## npc_loramus_thalipedes ######*/ -bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you help me?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -108,12 +108,12 @@ bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature) if (pPlayer->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { @@ -124,23 +124,23 @@ bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature, u case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); - pPlayer->SEND_GOSSIP_MENU(1813, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1813, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+21: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I do not understand", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); - pPlayer->SEND_GOSSIP_MENU(1814, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1814, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+22: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Indeed", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); - pPlayer->SEND_GOSSIP_MENU(1815, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1815, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+23: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will do this with or your help, Loramus", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); - pPlayer->SEND_GOSSIP_MENU(1816, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1816, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+24: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25); - pPlayer->SEND_GOSSIP_MENU(1817, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1817, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+25: pPlayer->CLOSE_GOSSIP_MENU(); @@ -394,30 +394,30 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI }; -bool GossipHello_mob_rizzle_sprysprocket(Player* pPlayer, Creature *_Creature) +bool GossipHello_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(10994) != QUEST_STATUS_INCOMPLETE) return true; pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(10811,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10811, pCreature->GetGUID()); return true; } -bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1 && pPlayer->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true); - CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die_Timer = 3000; - CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die = true; + pCreature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true); + CAST_AI(mob_rizzle_sprysprocketAI, pCreature->AI())->Must_Die_Timer = 3000; + CAST_AI(mob_rizzle_sprysprocketAI, pCreature->AI())->Must_Die = true; } return true; } -CreatureAI* GetAI_mob_rizzle_sprysprocket(Creature *_Creature) +CreatureAI* GetAI_mob_rizzle_sprysprocket(Creature* pCreature) { - return new mob_rizzle_sprysprocketAI (_Creature); + return new mob_rizzle_sprysprocketAI (pCreature); } /*#### @@ -473,9 +473,9 @@ struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_depth_charge(Creature *_Creature) +CreatureAI* GetAI_mob_depth_charge(Creature* pCreature) { - return new mob_depth_chargeAI (_Creature); + return new mob_depth_chargeAI (pCreature); } void AddSC_azshara() diff --git a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp index 8661d89a95d..c44772fd87e 100644 --- a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp @@ -139,9 +139,9 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_azuregos(Creature *_Creature) +CreatureAI* GetAI_boss_azuregos(Creature* pCreature) { - return new boss_azuregosAI (_Creature); + return new boss_azuregosAI (pCreature); } void AddSC_boss_azuregos() diff --git a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp index 6a0d1527456..65c0da3ee37 100644 --- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp @@ -167,9 +167,9 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI }else SayHelpTimer -= diff; } }; -CreatureAI* GetAI_npc_draenei_survivor(Creature *_Creature) +CreatureAI* GetAI_npc_draenei_survivor(Creature* pCreature) { - return new npc_draenei_survivorAI (_Creature); + return new npc_draenei_survivorAI (pCreature); } /*###### @@ -253,27 +253,27 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_engineer_spark_overgrind(Creature *_Creature) +CreatureAI* GetAI_npc_engineer_spark_overgrind(Creature* pCreature) { - return new npc_engineer_spark_overgrindAI (_Creature); + return new npc_engineer_spark_overgrindAI (pCreature); } -bool GossipHello_npc_engineer_spark_overgrind(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->setFaction(FACTION_HOSTILE); - CAST_AI(npc_engineer_spark_overgrindAI, _Creature->AI())->AttackStart(pPlayer); + pCreature->setFaction(FACTION_HOSTILE); + CAST_AI(npc_engineer_spark_overgrindAI, pCreature->AI())->AttackStart(pPlayer); } return true; } @@ -310,9 +310,9 @@ struct TRINITY_DLL_DECL npc_injured_draeneiAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_injured_draenei(Creature *_Creature) +CreatureAI* GetAI_npc_injured_draenei(Creature* pCreature) { - return new npc_injured_draeneiAI (_Creature); + return new npc_injured_draeneiAI (pCreature); } /*###### @@ -536,9 +536,9 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_geezleAI(Creature *_Creature) +CreatureAI* GetAI_npc_geezleAI(Creature* pCreature) { - return new npc_geezleAI(_Creature); + return new npc_geezleAI(pCreature); } /*###### diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp index 6c88d036bca..f75e496414f 100644 --- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp +++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp @@ -68,23 +68,23 @@ bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32 #define GOSSIP_SPUTTERVALVE "Can you tell me about this shard?" -bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) { - pPlayer->SEND_GOSSIP_MENU(2013, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2013, pCreature->GetGUID()); pPlayer->AreaExploredOrEventHappens(6981); } return true; @@ -394,9 +394,9 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_twiggy_flathead(Creature *_Creature) +CreatureAI* GetAI_npc_twiggy_flathead(Creature* pCreature) { - return new npc_twiggy_flatheadAI (_Creature); + return new npc_twiggy_flatheadAI (pCreature); } /*##### @@ -509,9 +509,9 @@ bool QuestAccept_npc_wizzlecrank_shredder(Player* pPlayer, Creature* creature, Q return true; } -CreatureAI* GetAI_npc_wizzlecrank_shredderAI(Creature *_Creature) +CreatureAI* GetAI_npc_wizzlecrank_shredderAI(Creature* pCreature) { - npc_wizzlecrank_shredderAI* thisAI = new npc_wizzlecrank_shredderAI(_Creature); + npc_wizzlecrank_shredderAI* thisAI = new npc_wizzlecrank_shredderAI(pCreature); thisAI->AddWaypoint(0, 1109.15, -3104.11, 82.41, 6000); thisAI->AddWaypoint(1, 1105.39, -3102.86, 82.74, 2000); diff --git a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp index 61c701eee55..9abda926177 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp @@ -35,18 +35,18 @@ EndContentData */ #define SPELL_TELEPORT 41566 // s41566 - Teleport to Ashtongue NPC's #define GOSSIP_OLUM1 "Teleport me to the other Ashtongue Deathsworn" -bool GossipHello_npc_spirit_of_olum(Player* pPlayer, Creature* _Creature) +bool GossipHello_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature) { - ScriptedInstance* pInstance = (_Creature->GetInstanceData()); + ScriptedInstance* pInstance = (pCreature->GetInstanceData()); if (pInstance && (pInstance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp index 149bfb0bb07..12c3d445018 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp @@ -328,9 +328,9 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_gurtogg_bloodboil(Creature *_Creature) +CreatureAI* GetAI_boss_gurtogg_bloodboil(Creature* pCreature) { - return new boss_gurtogg_bloodboilAI (_Creature); + return new boss_gurtogg_bloodboilAI (pCreature); } void AddSC_boss_gurtogg_bloodboil() diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index 44399736b8e..cd276d049b8 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -1568,20 +1568,20 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI }; -bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_akama_illidanAI, _Creature->AI())->EnterPhase(PHASE_CHANNEL); + CAST_AI(npc_akama_illidanAI, pCreature->AI())->EnterPhase(PHASE_CHANNEL); } return true; } -bool GossipHello_npc_akama_at_illidan(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(10465, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10465, pCreature->GetGUID()); return true; } @@ -2114,44 +2114,44 @@ void boss_illidan_stormrageAI::EnterPhase(PhaseIllidan NextPhase) Event = EVENT_NULL; } -CreatureAI* GetAI_boss_illidan_stormrage(Creature *_Creature) +CreatureAI* GetAI_boss_illidan_stormrage(Creature* pCreature) { - return new boss_illidan_stormrageAI (_Creature); + return new boss_illidan_stormrageAI (pCreature); } -CreatureAI* GetAI_npc_akama_at_illidan(Creature *_Creature) +CreatureAI* GetAI_npc_akama_at_illidan(Creature* pCreature) { - return new npc_akama_illidanAI(_Creature); + return new npc_akama_illidanAI(pCreature); } -CreatureAI* GetAI_boss_maiev(Creature *_Creature) +CreatureAI* GetAI_boss_maiev(Creature* pCreature) { - return new boss_maievAI (_Creature); + return new boss_maievAI (pCreature); } -CreatureAI* GetAI_mob_flame_of_azzinoth(Creature *_Creature) +CreatureAI* GetAI_mob_flame_of_azzinoth(Creature* pCreature) { - return new flame_of_azzinothAI (_Creature); + return new flame_of_azzinothAI (pCreature); } -CreatureAI* GetAI_cage_trap_trigger(Creature *_Creature) +CreatureAI* GetAI_cage_trap_trigger(Creature* pCreature) { - return new cage_trap_triggerAI (_Creature); + return new cage_trap_triggerAI (pCreature); } -CreatureAI* GetAI_shadow_demon(Creature *_Creature) +CreatureAI* GetAI_shadow_demon(Creature* pCreature) { - return new shadow_demonAI (_Creature); + return new shadow_demonAI (pCreature); } -CreatureAI* GetAI_blade_of_azzinoth(Creature *_Creature) +CreatureAI* GetAI_blade_of_azzinoth(Creature* pCreature) { - return new blade_of_azzinothAI (_Creature); + return new blade_of_azzinothAI (pCreature); } -CreatureAI* GetAI_parasitic_shadowfiend(Creature *_Creature) +CreatureAI* GetAI_parasitic_shadowfiend(Creature* pCreature) { - return new mob_parasitic_shadowfiendAI (_Creature); + return new mob_parasitic_shadowfiendAI (pCreature); } void AddSC_boss_illidan() diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp index 1936677539e..a33874c74cf 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp @@ -299,9 +299,9 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_shahraz(Creature *_Creature) +CreatureAI* GetAI_boss_shahraz(Creature* pCreature) { - return new boss_shahrazAI (_Creature); + return new boss_shahrazAI (pCreature); } void AddSC_boss_mother_shahraz() diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp index cc9a84cb5ca..aa81259e451 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp @@ -654,29 +654,29 @@ void npc_enslaved_soulAI::JustDied(Unit *killer) DoCast(m_creature, SPELL_SOUL_RELEASE, true); } -CreatureAI* GetAI_boss_reliquary_of_souls(Creature *_Creature) +CreatureAI* GetAI_boss_reliquary_of_souls(Creature* pCreature) { - return new boss_reliquary_of_soulsAI (_Creature); + return new boss_reliquary_of_soulsAI (pCreature); } -CreatureAI* GetAI_boss_essence_of_suffering(Creature *_Creature) +CreatureAI* GetAI_boss_essence_of_suffering(Creature* pCreature) { - return new boss_essence_of_sufferingAI (_Creature); + return new boss_essence_of_sufferingAI (pCreature); } -CreatureAI* GetAI_boss_essence_of_desire(Creature *_Creature) +CreatureAI* GetAI_boss_essence_of_desire(Creature* pCreature) { - return new boss_essence_of_desireAI (_Creature); + return new boss_essence_of_desireAI (pCreature); } -CreatureAI* GetAI_boss_essence_of_anger(Creature *_Creature) +CreatureAI* GetAI_boss_essence_of_anger(Creature* pCreature) { - return new boss_essence_of_angerAI (_Creature); + return new boss_essence_of_angerAI (pCreature); } -CreatureAI* GetAI_npc_enslaved_soul(Creature *_Creature) +CreatureAI* GetAI_npc_enslaved_soul(Creature* pCreature) { - return new npc_enslaved_soulAI (_Creature); + return new npc_enslaved_soulAI (pCreature); } void AddSC_boss_reliquary_of_souls() diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp index 7907a411b46..0f953933213 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp @@ -800,43 +800,43 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_shade_of_akama(Creature *_Creature) +CreatureAI* GetAI_boss_shade_of_akama(Creature* pCreature) { - return new boss_shade_of_akamaAI (_Creature); + return new boss_shade_of_akamaAI (pCreature); } -CreatureAI* GetAI_mob_ashtongue_channeler(Creature *_Creature) +CreatureAI* GetAI_mob_ashtongue_channeler(Creature* pCreature) { - return new mob_ashtongue_channelerAI (_Creature); + return new mob_ashtongue_channelerAI (pCreature); } -CreatureAI* GetAI_mob_ashtongue_sorcerer(Creature *_Creature) +CreatureAI* GetAI_mob_ashtongue_sorcerer(Creature* pCreature) { - return new mob_ashtongue_sorcererAI (_Creature); + return new mob_ashtongue_sorcererAI (pCreature); } -CreatureAI* GetAI_npc_akama_shade(Creature *_Creature) +CreatureAI* GetAI_npc_akama_shade(Creature* pCreature) { - return new npc_akamaAI (_Creature); + return new npc_akamaAI (pCreature); } -bool GossipSelect_npc_akama(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_akama(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_akamaAI, _Creature->AI())->BeginEvent(pPlayer); + CAST_AI(npc_akamaAI, pCreature->AI())->BeginEvent(pPlayer); } return true; } -bool GossipHello_npc_akama(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_akama(Player* pPlayer, Creature* pCreature) { if (pPlayer->isAlive()) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); } return true; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp index ae3a807f969..669b0a25629 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp @@ -260,19 +260,19 @@ struct TRINITY_DLL_DECL npc_volcanoAI : public Scripted_NoMovementAI }; -CreatureAI* GetAI_boss_supremus(Creature *_Creature) +CreatureAI* GetAI_boss_supremus(Creature* pCreature) { - return new boss_supremusAI (_Creature); + return new boss_supremusAI (pCreature); } -CreatureAI* GetAI_molten_flame(Creature *_Creature) +CreatureAI* GetAI_molten_flame(Creature* pCreature) { - return new molten_flameAI (_Creature); + return new molten_flameAI (pCreature); } -CreatureAI* GetAI_npc_volcano(Creature *_Creature) +CreatureAI* GetAI_npc_volcano(Creature* pCreature) { - return new npc_volcanoAI (_Creature); + return new npc_volcanoAI (pCreature); } void AddSC_boss_supremus() diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp index 3d7f0c7c5c4..25a82877388 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp @@ -484,19 +484,19 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_doom_blossom(Creature *_Creature) +CreatureAI* GetAI_mob_doom_blossom(Creature* pCreature) { - return new mob_doom_blossomAI(_Creature); + return new mob_doom_blossomAI(pCreature); } -CreatureAI* GetAI_mob_shadowy_construct(Creature *_Creature) +CreatureAI* GetAI_mob_shadowy_construct(Creature* pCreature) { - return new mob_shadowy_constructAI(_Creature); + return new mob_shadowy_constructAI(pCreature); } -CreatureAI* GetAI_boss_teron_gorefiend(Creature *_Creature) +CreatureAI* GetAI_boss_teron_gorefiend(Creature* pCreature) { - return new boss_teron_gorefiendAI (_Creature); + return new boss_teron_gorefiendAI (pCreature); } void AddSC_boss_teron_gorefiend() diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp index 7c7224b3efd..a987b63a287 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp @@ -205,9 +205,9 @@ bool GOHello_go_najentus_spine(Player* pPlayer, GameObject* _GO) return true; } -CreatureAI* GetAI_boss_najentus(Creature *_Creature) +CreatureAI* GetAI_boss_najentus(Creature* pCreature) { - return new boss_najentusAI (_Creature); + return new boss_najentusAI (pCreature); } void AddSC_boss_najentus() diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp index 908c00a37fa..bf39aba0f82 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp @@ -810,29 +810,29 @@ CreatureAI* GetAI_mob_blood_elf_council_voice_trigger(Creature* c) return new mob_blood_elf_council_voice_triggerAI(c); } -CreatureAI* GetAI_mob_illidari_council(Creature *_Creature) +CreatureAI* GetAI_mob_illidari_council(Creature* pCreature) { - return new mob_illidari_councilAI (_Creature); + return new mob_illidari_councilAI (pCreature); } -CreatureAI* GetAI_boss_gathios_the_shatterer(Creature *_Creature) +CreatureAI* GetAI_boss_gathios_the_shatterer(Creature* pCreature) { - return new boss_gathios_the_shattererAI (_Creature); + return new boss_gathios_the_shattererAI (pCreature); } -CreatureAI* GetAI_boss_lady_malande(Creature *_Creature) +CreatureAI* GetAI_boss_lady_malande(Creature* pCreature) { - return new boss_lady_malandeAI (_Creature); + return new boss_lady_malandeAI (pCreature); } -CreatureAI* GetAI_boss_veras_darkshadow(Creature *_Creature) +CreatureAI* GetAI_boss_veras_darkshadow(Creature* pCreature) { - return new boss_veras_darkshadowAI (_Creature); + return new boss_veras_darkshadowAI (pCreature); } -CreatureAI* GetAI_boss_high_nethermancer_zerevor(Creature *_Creature) +CreatureAI* GetAI_boss_high_nethermancer_zerevor(Creature* pCreature) { - return new boss_high_nethermancer_zerevorAI (_Creature); + return new boss_high_nethermancer_zerevorAI (pCreature); } void AddSC_boss_illidari_council() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp index fb35017fbe8..be017692d0a 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -304,9 +304,9 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI } }; -CreatureAI* GetAI_npc_grimstone(Creature *_Creature) +CreatureAI* GetAI_npc_grimstone(Creature* pCreature) { - npc_grimstoneAI* Grimstone_AI = new npc_grimstoneAI(_Creature); + npc_grimstoneAI* Grimstone_AI = new npc_grimstoneAI(pCreature); Grimstone_AI->FillPointMovementListForCreature(); @@ -369,9 +369,9 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_mob_phalanx(Creature *_Creature) +CreatureAI* GetAI_mob_phalanx(Creature* pCreature) { - return new mob_phalanxAI (_Creature); + return new mob_phalanxAI (pCreature); } /*###### @@ -393,10 +393,10 @@ CreatureAI* GetAI_mob_phalanx(Creature *_Creature) #define GOSSIP_ITEM_KHARAN_9 "Indeed." #define GOSSIP_ITEM_KHARAN_10 "The door is open, Kharan. You are a free man." -bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -405,49 +405,49 @@ bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); if (pPlayer->GetTeam() == HORDE) - pPlayer->SEND_GOSSIP_MENU(2473, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2473, pCreature->GetGUID()); else - pPlayer->SEND_GOSSIP_MENU(2474, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2474, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(2475, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2475, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(2476, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2476, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(2477, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2477, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(2478, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2478, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(2479, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2479, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - pPlayer->SEND_GOSSIP_MENU(2480, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2480, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8); - pPlayer->SEND_GOSSIP_MENU(2481, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2481, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+8: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); - pPlayer->SEND_GOSSIP_MENU(2482, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2482, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+9: pPlayer->CLOSE_GOSSIP_MENU(); @@ -472,12 +472,12 @@ bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature, u #define GOSSIP_ITEM_SHOW_ACCESS "Show me what I have access to, Lothos." #define GOSSIP_ITEM_GET_CONTRACT "Get Thorium Brotherhood Contract" -bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY) + if (pCreature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (pPlayer->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 && @@ -488,14 +488,14 @@ bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature) } if (pPlayer->GetReputationRank(59) < REP_FRIENDLY) - pPlayer->SEND_GOSSIP_MENU(3673, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3673, pCreature->GetGUID()); else - pPlayer->SEND_GOSSIP_MENU(3677, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3677, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { @@ -503,7 +503,7 @@ bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false); } if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -568,9 +568,9 @@ struct TRINITY_DLL_DECL npc_dughal_stormwingAI : public npc_escortAI npc_escortAI::UpdateAI(diff); } }; -CreatureAI* GetAI_npc_dughal_stormwing(Creature *_Creature) +CreatureAI* GetAI_npc_dughal_stormwing(Creature* pCreature) { - npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(_Creature); + npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(pCreature); dughal_stormwingAI->AddWaypoint(0, 280.42,-82.86, -77.12,0); dughal_stormwingAI->AddWaypoint(1, 287.64,-87.01, -76.79,0); @@ -578,23 +578,23 @@ CreatureAI* GetAI_npc_dughal_stormwing(Creature *_Creature) return dughal_stormwingAI; } -bool GossipHello_npc_dughal_stormwing(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2846, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2846, pCreature->GetGUID()); } return true; } -bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID()); - _Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); + pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); } return true; @@ -716,9 +716,9 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI npc_escortAI::UpdateAI(diff); } }; -CreatureAI* GetAI_npc_marshal_windsor(Creature *_Creature) +CreatureAI* GetAI_npc_marshal_windsor(Creature* pCreature) { - npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(_Creature); + npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(pCreature); marshal_windsorAI->AddWaypoint(0, 316.336,-225.528, -77.7258,7000); marshal_windsorAI->AddWaypoint(1, 316.336,-225.528, -77.7258,2000); @@ -928,9 +928,9 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI npc_escortAI::UpdateAI(diff); } }; -CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature *_Creature) +CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature* pCreature) { - npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(_Creature); + npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(pCreature); marshal_reginald_windsorAI->AddWaypoint(0, 403.61,-52.71, -63.92,4000); marshal_reginald_windsorAI->AddWaypoint(1, 403.61,-52.71, -63.92,4000); @@ -1030,9 +1030,9 @@ struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI } }; -CreatureAI* GetAI_npc_tobias_seecher(Creature *_Creature) +CreatureAI* GetAI_npc_tobias_seecher(Creature* pCreature) { - npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(_Creature); + npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(pCreature); tobias_seecherAI->AddWaypoint(0, 549.21, -281.07, -75.27); tobias_seecherAI->AddWaypoint(1, 554.39, -267.39, -73.68); @@ -1043,23 +1043,23 @@ CreatureAI* GetAI_npc_tobias_seecher(Creature *_Creature) return tobias_seecherAI; } -bool GossipHello_npc_tobias_seecher(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_tobias_seecher(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2847, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2847, pCreature->GetGUID()); } return true; } -bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID()); - _Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); + pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_IN_PROGRESS); } return true; @@ -1165,18 +1165,18 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI } }; -CreatureAI* GetAI_npc_rocknot(Creature *_Creature) +CreatureAI* GetAI_npc_rocknot(Creature* pCreature) { - npc_rocknotAI* Rocknot_AI = new npc_rocknotAI(_Creature); + npc_rocknotAI* Rocknot_AI = new npc_rocknotAI(pCreature); Rocknot_AI->FillPointMovementListForCreature(); return Rocknot_AI; } -bool ChooseReward_npc_rocknot(Player* pPlayer, Creature *_Creature, const Quest *_Quest, uint32 item) +bool ChooseReward_npc_rocknot(Player* pPlayer, Creature* pCreature, const Quest *_Quest, uint32 item) { - ScriptedInstance* pInstance = (_Creature->GetInstanceData()); + ScriptedInstance* pInstance = (pCreature->GetInstanceData()); if (!pInstance) return true; @@ -1194,9 +1194,9 @@ bool ChooseReward_npc_rocknot(Player* pPlayer, Creature *_Creature, const Quest //keep track of amount in instance script, returns SPECIAL if amount ok and event in progress if (pInstance->GetData(TYPE_BAR) == SPECIAL) { - DoScriptText(SAY_GOT_BEER, _Creature); - _Creature->CastSpell(_Creature,SPELL_DRUNKEN_RAGE,false); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false); + DoScriptText(SAY_GOT_BEER, pCreature); + pCreature->CastSpell(pCreature,SPELL_DRUNKEN_RAGE,false); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, false); } } diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp index e24493c3c71..1f2147b722c 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp @@ -91,9 +91,9 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_ambassador_flamelash(Creature *_Creature) +CreatureAI* GetAI_boss_ambassador_flamelash(Creature* pCreature) { - return new boss_ambassador_flamelashAI (_Creature); + return new boss_ambassador_flamelashAI (pCreature); } void AddSC_boss_ambassador_flamelash() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp index 7bb97c59b2e..3ad9458aba4 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp @@ -100,9 +100,9 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_anubshiah(Creature *_Creature) +CreatureAI* GetAI_boss_anubshiah(Creature* pCreature) { - return new boss_anubshiahAI (_Creature); + return new boss_anubshiahAI (pCreature); } void AddSC_boss_anubshiah() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index 94a018ec151..2b6e67a7903 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_draganthaurissan(Creature *_Creature) +CreatureAI* GetAI_boss_draganthaurissan(Creature* pCreature) { - return new boss_draganthaurissanAI (_Creature); + return new boss_draganthaurissanAI (pCreature); } void AddSC_boss_draganthaurissan() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp index cbbdc237c27..337071c938e 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp @@ -152,9 +152,9 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_general_angerforge(Creature *_Creature) +CreatureAI* GetAI_boss_general_angerforge(Creature* pCreature) { - return new boss_general_angerforgeAI (_Creature); + return new boss_general_angerforgeAI (pCreature); } void AddSC_boss_general_angerforge() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp index 3895605010f..a4400e4d663 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -66,9 +66,9 @@ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_gorosh_the_dervish(Creature *_Creature) +CreatureAI* GetAI_boss_gorosh_the_dervish(Creature* pCreature) { - return new boss_gorosh_the_dervishAI (_Creature); + return new boss_gorosh_the_dervishAI (pCreature); } void AddSC_boss_gorosh_the_dervish() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp index 0791c3dfe36..faaa8f0a069 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp @@ -73,9 +73,9 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_grizzle(Creature *_Creature) +CreatureAI* GetAI_boss_grizzle(Creature* pCreature) { - return new boss_grizzleAI (_Creature); + return new boss_grizzleAI (pCreature); } void AddSC_boss_grizzle() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp index 05f62558d03..c2c97a9ec8a 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_high_interrogator_gerstahn(Creature *_Creature) +CreatureAI* GetAI_boss_high_interrogator_gerstahn(Creature* pCreature) { - return new boss_high_interrogator_gerstahnAI (_Creature); + return new boss_high_interrogator_gerstahnAI (pCreature); } void AddSC_boss_high_interrogator_gerstahn() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp index 52e985f7f04..d0b97116c28 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp @@ -69,9 +69,9 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_magmus(Creature *_Creature) +CreatureAI* GetAI_boss_magmus(Creature* pCreature) { - return new boss_magmusAI (_Creature); + return new boss_magmusAI (pCreature); } void AddSC_boss_magmus() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp index b71d4c17007..7602a14fbfe 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp @@ -84,9 +84,9 @@ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_moira_bronzebeard(Creature *_Creature) +CreatureAI* GetAI_boss_moira_bronzebeard(Creature* pCreature) { - return new boss_moira_bronzebeardAI (_Creature); + return new boss_moira_bronzebeardAI (pCreature); } void AddSC_boss_moira_bronzebeard() diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp index cc6822a50c1..a9c3d1d9ebd 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp @@ -103,9 +103,9 @@ struct TRINITY_DLL_DECL boss_angerrelAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_angerrel(Creature *_Creature) +CreatureAI* GetAI_boss_angerrel(Creature* pCreature) { - return new boss_angerrelAI (_Creature); + return new boss_angerrelAI (pCreature); } enum @@ -187,9 +187,9 @@ struct TRINITY_DLL_DECL boss_doperelAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_doperel(Creature *_Creature) +CreatureAI* GetAI_boss_doperel(Creature* pCreature) { - return new boss_doperelAI (_Creature); + return new boss_doperelAI (pCreature); } enum @@ -283,9 +283,9 @@ struct TRINITY_DLL_DECL boss_haterelAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_haterel(Creature *_Creature) +CreatureAI* GetAI_boss_haterel(Creature* pCreature) { - return new boss_haterelAI (_Creature); + return new boss_haterelAI (pCreature); } enum @@ -377,9 +377,9 @@ struct TRINITY_DLL_DECL boss_vilerelAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_vilerel(Creature *_Creature) +CreatureAI* GetAI_boss_vilerel(Creature* pCreature) { - return new boss_vilerelAI (_Creature); + return new boss_vilerelAI (pCreature); } enum @@ -485,9 +485,9 @@ struct TRINITY_DLL_DECL boss_seethrelAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_seethrel(Creature *_Creature) +CreatureAI* GetAI_boss_seethrel(Creature* pCreature) { - return new boss_seethrelAI (_Creature); + return new boss_seethrelAI (pCreature); } enum @@ -571,16 +571,16 @@ struct TRINITY_DLL_DECL boss_gloomrelAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_gloomrel(Creature *_Creature) +CreatureAI* GetAI_boss_gloomrel(Creature* pCreature) { - return new boss_gloomrelAI (_Creature); + return new boss_gloomrelAI (pCreature); } #define GOSSIP_ITEM_TEACH_1 "Teach me the art of smelting dark iron" #define GOSSIP_ITEM_TEACH_2 "Continue..." #define GOSSIP_ITEM_TRIBUTE "I want to pay tribute" -bool GossipHello_boss_gloomrel(Player* pPlayer, Creature *_Creature) +bool GossipHello_boss_gloomrel(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestRewardStatus(4083) == 1 && pPlayer->GetSkillValue(SKILL_MINING) >= 230 && !pPlayer->HasSpell(14891)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -588,29 +588,29 @@ bool GossipHello_boss_gloomrel(Player* pPlayer, Creature *_Creature) if (pPlayer->GetQuestRewardStatus(4083) == 0 && pPlayer->GetSkillValue(SKILL_MINING) >= 230) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(2606, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2606, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer, 14894, false); + pCreature->CastSpell(pPlayer, 14894, false); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); - pPlayer->SEND_GOSSIP_MENU(2604, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2604, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+22: pPlayer->CLOSE_GOSSIP_MENU(); - if (ScriptedInstance* pInstance = _Creature->GetInstanceData()) + if (ScriptedInstance* pInstance = pCreature->GetInstanceData()) { //are 5 minutes expected? go template may have data to despawn when used at quest pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE),MINUTE*5); @@ -736,36 +736,36 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_doomrel(Creature *_Creature) +CreatureAI* GetAI_boss_doomrel(Creature* pCreature) { - return new boss_doomrelAI (_Creature); + return new boss_doomrelAI (pCreature); } #define GOSSIP_ITEM_CHALLENGE "Your bondage is at an end, Doom'rel. I challenge you!" -bool GossipHello_boss_doomrel(Player* pPlayer, Creature *_Creature) +bool GossipHello_boss_doomrel(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2601, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2601, pCreature->GetGUID()); return true; } -bool GossipSelect_boss_doomrel(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_boss_doomrel(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(2605, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2605, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); //start event here - _Creature->setFaction(FACTION_HOSTILE); - _Creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); - _Creature->AI()->AttackStart(pPlayer); - ScriptedInstance* pInstance = _Creature->GetInstanceData(); + pCreature->setFaction(FACTION_HOSTILE); + pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); + pCreature->AI()->AttackStart(pPlayer); + ScriptedInstance* pInstance = pCreature->GetInstanceData(); if (pInstance) pInstance->SetData64(DATA_EVENSTARTER,pPlayer->GetGUID()); break; diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp index 29eb7e39c73..72bc0aa6bd2 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp @@ -86,9 +86,9 @@ struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_drakkisath(Creature *_Creature) +CreatureAI* GetAI_boss_drakkisath(Creature* pCreature) { - return new boss_drakkisathAI (_Creature); + return new boss_drakkisathAI (pCreature); } void AddSC_boss_drakkisath() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp index b8f8a9fad2d..4a6a01af71d 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp @@ -190,9 +190,9 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_gyth(Creature *_Creature) +CreatureAI* GetAI_boss_gyth(Creature* pCreature) { - return new boss_gythAI (_Creature); + return new boss_gythAI (pCreature); } void AddSC_boss_gyth() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp index c48edc0a942..1727105427b 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp @@ -80,9 +80,9 @@ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_halycon(Creature *_Creature) +CreatureAI* GetAI_boss_halycon(Creature* pCreature) { - return new boss_halyconAI (_Creature); + return new boss_halyconAI (pCreature); } void AddSC_boss_halycon() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp index 6d4c6d1f09e..06dee5b5775 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp @@ -116,9 +116,9 @@ struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_highlordomokk(Creature *_Creature) +CreatureAI* GetAI_boss_highlordomokk(Creature* pCreature) { - return new boss_highlordomokkAI (_Creature); + return new boss_highlordomokkAI (pCreature); } void AddSC_boss_highlordomokk() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp index f88f33ac530..0bc2f9d2370 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp @@ -71,9 +71,9 @@ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_mothersmolderweb(Creature *_Creature) +CreatureAI* GetAI_boss_mothersmolderweb(Creature* pCreature) { - return new boss_mothersmolderwebAI (_Creature); + return new boss_mothersmolderwebAI (pCreature); } void AddSC_boss_mothersmolderweb() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp index 2b05c0dd548..0931db0319a 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -114,9 +114,9 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_overlordwyrmthalak(Creature *_Creature) +CreatureAI* GetAI_boss_overlordwyrmthalak(Creature* pCreature) { - return new boss_overlordwyrmthalakAI (_Creature); + return new boss_overlordwyrmthalakAI (pCreature); } void AddSC_boss_overlordwyrmthalak() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp index 5edc668ad17..dd4479fbeaa 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -78,9 +78,9 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_pyroguard_emberseer(Creature *_Creature) +CreatureAI* GetAI_boss_pyroguard_emberseer(Creature* pCreature) { - return new boss_pyroguard_emberseerAI (_Creature); + return new boss_pyroguard_emberseerAI (pCreature); } void AddSC_boss_pyroguard_emberseer() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp index 7fc8e866444..c2db9b7f750 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp @@ -70,9 +70,9 @@ struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_quatermasterzigris(Creature *_Creature) +CreatureAI* GetAI_boss_quatermasterzigris(Creature* pCreature) { - return new boss_quatermasterzigrisAI (_Creature); + return new boss_quatermasterzigrisAI (pCreature); } void AddSC_boss_quatermasterzigris() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp index 9ac7c9f9556..2899b05deb6 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp @@ -76,9 +76,9 @@ struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_rend_blackhand(Creature *_Creature) +CreatureAI* GetAI_boss_rend_blackhand(Creature* pCreature) { - return new boss_rend_blackhandAI (_Creature); + return new boss_rend_blackhandAI (pCreature); } void AddSC_boss_rend_blackhand() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index 5b095eb0d73..ae44306cf30 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -80,9 +80,9 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_shadowvosh(Creature *_Creature) +CreatureAI* GetAI_boss_shadowvosh(Creature* pCreature) { - return new boss_shadowvoshAI (_Creature); + return new boss_shadowvoshAI (pCreature); } void AddSC_boss_shadowvosh() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp index eb0024d7629..802ab32cc80 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp @@ -78,9 +78,9 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_thebeast(Creature *_Creature) +CreatureAI* GetAI_boss_thebeast(Creature* pCreature) { - return new boss_thebeastAI (_Creature); + return new boss_thebeastAI (pCreature); } void AddSC_boss_thebeast() diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp index 2e45b414e7c..2257a290a1b 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp @@ -106,9 +106,9 @@ struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_warmastervoone(Creature *_Creature) +CreatureAI* GetAI_boss_warmastervoone(Creature* pCreature) { - return new boss_warmastervooneAI (_Creature); + return new boss_warmastervooneAI (pCreature); } void AddSC_boss_warmastervoone() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp index a4654ee575b..48a2888c1e6 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp @@ -96,9 +96,9 @@ struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_broodlord(Creature *_Creature) +CreatureAI* GetAI_boss_broodlord(Creature* pCreature) { - return new boss_broodlordAI (_Creature); + return new boss_broodlordAI (pCreature); } void AddSC_boss_broodlord() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp index bed6d44b9e7..7b3e04f9d37 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp @@ -300,9 +300,9 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_chromaggus(Creature *_Creature) +CreatureAI* GetAI_boss_chromaggus(Creature* pCreature) { - return new boss_chromaggusAI (_Creature); + return new boss_chromaggusAI (pCreature); } void AddSC_boss_chromaggus() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp index 518bf147288..02f59819516 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp @@ -88,9 +88,9 @@ struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_ebonroc(Creature *_Creature) +CreatureAI* GetAI_boss_ebonroc(Creature* pCreature) { - return new boss_ebonrocAI (_Creature); + return new boss_ebonrocAI (pCreature); } void AddSC_boss_ebonroc() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp index 14c3678accd..bab716acffd 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp @@ -79,9 +79,9 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_firemaw(Creature *_Creature) +CreatureAI* GetAI_boss_firemaw(Creature* pCreature) { - return new boss_firemawAI (_Creature); + return new boss_firemawAI (pCreature); } void AddSC_boss_firemaw() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp index 2811773903e..5492477193f 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp @@ -82,9 +82,9 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_flamegor(Creature *_Creature) +CreatureAI* GetAI_boss_flamegor(Creature* pCreature) { - return new boss_flamegorAI (_Creature); + return new boss_flamegorAI (pCreature); } void AddSC_boss_flamegor() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp index e5058a33866..4ecfda2e329 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp @@ -209,9 +209,9 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_nefarian(Creature *_Creature) +CreatureAI* GetAI_boss_nefarian(Creature* pCreature) { - return new boss_nefarianAI (_Creature); + return new boss_nefarianAI (pCreature); } void AddSC_boss_nefarian() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp index 3f67b98fc65..731e32578d2 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp @@ -113,9 +113,9 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_razorgore(Creature *_Creature) +CreatureAI* GetAI_boss_razorgore(Creature* pCreature) { - return new boss_razorgoreAI (_Creature); + return new boss_razorgoreAI (pCreature); } void AddSC_boss_razorgore() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp index e9dea7122bc..2df0f38bca5 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp @@ -215,34 +215,34 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI } }; -void SendDefaultMenu_boss_vael(Player* pPlayer, Creature *_Creature, uint32 action) +void SendDefaultMenu_boss_vael(Player* pPlayer, Creature* pCreature, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(boss_vaelAI, _Creature->AI())->BeginSpeach(pPlayer); + CAST_AI(boss_vaelAI, pCreature->AI())->BeginSpeach(pPlayer); } } -bool GossipSelect_boss_vael(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_boss_vael(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (sender == GOSSIP_SENDER_MAIN) - SendDefaultMenu_boss_vael(pPlayer, _Creature, action); + SendDefaultMenu_boss_vael(pPlayer, pCreature, action); return true; } -bool GossipHello_boss_vael(Player* pPlayer, Creature *_Creature) +bool GossipHello_boss_vael(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(907,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; } -CreatureAI* GetAI_boss_vael(Creature *_Creature) +CreatureAI* GetAI_boss_vael(Creature* pCreature) { - return new boss_vaelAI (_Creature); + return new boss_vaelAI (pCreature); } void AddSC_boss_vael() diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp index d96c0b9785b..1dd78d2e518 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp @@ -345,34 +345,34 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_victor_nefarius(Creature *_Creature) +CreatureAI* GetAI_boss_victor_nefarius(Creature* pCreature) { - return new boss_victor_nefariusAI (_Creature); + return new boss_victor_nefariusAI (pCreature); } -bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature *_Creature) +bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(7134,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7134, pCreature->GetGUID()); return true; } -bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(7198, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7198, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(7199, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7199, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); - DoScriptText(SAY_GAMESBEGIN_1, _Creature); - CAST_AI(boss_victor_nefariusAI, _Creature->AI())->BeginEvent(pPlayer); + DoScriptText(SAY_GAMESBEGIN_1, pCreature); + CAST_AI(boss_victor_nefariusAI, pCreature->AI())->BeginEvent(pPlayer); break; } return true; diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp index f038346371a..cc3613eefec 100644 --- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp @@ -60,9 +60,9 @@ struct TRINITY_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_mobs_bladespire_ogre(Creature *_Creature) +CreatureAI* GetAI_mobs_bladespire_ogre(Creature* pCreature) { - return new mobs_bladespire_ogreAI (_Creature); + return new mobs_bladespire_ogreAI (pCreature); } /*###### @@ -233,9 +233,9 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI } }; -CreatureAI* GetAI_mobs_nether_drake(Creature *_Creature) +CreatureAI* GetAI_mobs_nether_drake(Creature* pCreature) { - return new mobs_nether_drakeAI (_Creature); + return new mobs_nether_drakeAI (pCreature); } /*###### @@ -272,30 +272,30 @@ struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_daranelle(Creature *_Creature) +CreatureAI* GetAI_npc_daranelle(Creature* pCreature) { - return new npc_daranelleAI (_Creature); + return new npc_daranelleAI (pCreature); } /*###### ## npc_overseer_nuaar ######*/ -bool GossipHello_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Overseer, I am here to negotiate on behalf of the Cenarion Expedition.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10532, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10532, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { - pPlayer->SEND_GOSSIP_MENU(10533, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10533, pCreature->GetGUID()); pPlayer->AreaExploredOrEventHappens(10682); } return true; @@ -305,27 +305,27 @@ bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature, uint3 ## npc_saikkal_the_elder ######*/ -bool GossipHello_npc_saikkal_the_elder(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes... yes, it's me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10794, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10794, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes elder. Tell me more of the book.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(10795, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10795, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); - pPlayer->SEND_GOSSIP_MENU(10796, _Creature->GetGUID()); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10796, pCreature->GetGUID()); break; } return true; diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp index 406ae983559..ae53e1995d4 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp @@ -38,22 +38,22 @@ EndContentData */ #define SPELL_TELEPORT_SINGLE_IN_GROUP 13142 #define SPELL_TELEPORT_GROUP 27686 -bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(10757, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true); + pCreature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true); } return true; @@ -73,10 +73,10 @@ bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature *_Creature, uint32 #define GOSSIP_ITEM_FALLEN4 "You can count on me, Hero" #define GOSSIP_ITEM_FALLEN5 "I shall" -bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -87,53 +87,53 @@ bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature) if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(1392, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1392, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: - pPlayer->SEND_GOSSIP_MENU(1411, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID()); if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE) pPlayer->AreaExploredOrEventHappens(2784); if (pPlayer->GetTeam() == ALLIANCE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1411, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetGUID()); } break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); - pPlayer->SEND_GOSSIP_MENU(1451, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1451, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+21: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); - pPlayer->SEND_GOSSIP_MENU(1452, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1452, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+22: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); - pPlayer->SEND_GOSSIP_MENU(1453, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1453, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+23: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); - pPlayer->SEND_GOSSIP_MENU(1454, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1454, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+24: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25); - pPlayer->SEND_GOSSIP_MENU(1455, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1455, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+25: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26); - pPlayer->SEND_GOSSIP_MENU(1456, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1456, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+26: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp index f7989b3af01..0452a5763dd 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp @@ -167,9 +167,9 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_kruul(Creature *_Creature) +CreatureAI* GetAI_boss_kruul(Creature* pCreature) { - return new boss_kruulAI (_Creature); + return new boss_kruulAI (pCreature); } void AddSC_boss_kruul() diff --git a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp index 4dd4185bc90..24442be131f 100644 --- a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp @@ -68,9 +68,9 @@ struct TRINITY_DLL_DECL mob_webbed_creatureAI : public ScriptedAI m_creature->SummonCreature(spawnCreatureID, 0.0f, 0.0f, 0.0f, m_creature->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); } }; -CreatureAI* GetAI_mob_webbed_creature(Creature *_Creature) +CreatureAI* GetAI_mob_webbed_creature(Creature* pCreature) { - return new mob_webbed_creatureAI (_Creature); + return new mob_webbed_creatureAI (pCreature); } /*###### @@ -79,46 +79,46 @@ CreatureAI* GetAI_mob_webbed_creature(Creature *_Creature) #define C_SUNHAWK_TRIGGER 17974 -bool GossipHello_npc_captured_sunhawk_agent(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature) { if (pPlayer->HasAura(31609) && pPlayer->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9136, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9136, pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(9134, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9134, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(9137, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9137, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(9138, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9138, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(9139, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9139, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(9140, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9140, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(9141, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9141, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->TalkedToCreature(C_SUNHAWK_TRIGGER, _Creature->GetGUID()); + pPlayer->TalkedToCreature(C_SUNHAWK_TRIGGER, pCreature->GetGUID()); break; } return true; diff --git a/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp b/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp index 8f9dacf8e3b..91b862eaa29 100644 --- a/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp +++ b/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp @@ -34,14 +34,14 @@ EndContentData */ #define GOSSIP_ITEM_TELEPORT "Teleport me to Amber Ledge, please." -bool GossipHello_npc_tiare(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_tiare(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_tiare(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_tiare(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_OPTION_GOSSIP) { @@ -58,22 +58,22 @@ bool GossipSelect_npc_tiare(Player* pPlayer, Creature *_Creature, uint32 sender, #define GOSSIP_ITEM_FREE_FLIGHT "I'd like passage to the Transitus Shield." #define GOSSIP_ITEM_FLIGHT "May I use a drake to fly elsewhere?" -bool GossipHello_npc_surristrasz(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_surristrasz(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isTaxi()) + if (pCreature->isTaxi()) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FREE_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_TAXIVENDOR); } - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_OPTION_GOSSIP) { @@ -82,7 +82,7 @@ bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature *_Creature, uint32 s } if (action == GOSSIP_OPTION_TAXIVENDOR) { - pPlayer->GetSession()->SendTaxiMenu(_Creature); + pPlayer->GetSession()->SendTaxiMenu(pCreature); } return true; } @@ -226,9 +226,9 @@ struct TRINITY_DLL_DECL npc_khunok_the_behemothAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_khunok_the_behemoth(Creature *_Creature) +CreatureAI* GetAI_npc_khunok_the_behemoth(Creature* pCreature) { - return new npc_khunok_the_behemothAI(_Creature); + return new npc_khunok_the_behemothAI(pCreature); } void AddSC_borean_tundra() diff --git a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp index e5c4f59886b..2a98be637bf 100644 --- a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp +++ b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp @@ -67,70 +67,70 @@ struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI void EnterCombat(Unit *who) {} }; -CreatureAI* GetAI_npc_ragged_john(Creature *_Creature) +CreatureAI* GetAI_npc_ragged_john(Creature* pCreature) { - return new npc_ragged_johnAI (_Creature); + return new npc_ragged_johnAI (pCreature); } -bool GossipHello_npc_ragged_john(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_ragged_john(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(2713, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2713, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2714, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2714, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(2715, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2715, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(2716, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2716, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(2717, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2717, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(2718, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2718, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(2719, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2719, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(2720, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2720, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8); - pPlayer->SEND_GOSSIP_MENU(2721, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2721, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+8: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); - pPlayer->SEND_GOSSIP_MENU(2722, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2722, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+9: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); - pPlayer->SEND_GOSSIP_MENU(2723, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2723, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(2725, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2725, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp index 0ac0bbab8a9..2e9877e97e2 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp @@ -70,9 +70,9 @@ struct TRINITY_DLL_DECL boss_epochAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_epoch(Creature *_Creature) +CreatureAI* GetAI_boss_epoch(Creature* pCreature) { - return new boss_epochAI (_Creature); + return new boss_epochAI (pCreature); } void AddSC_boss_epoch() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp index d59e00de389..bd68d94d994 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp @@ -107,9 +107,9 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_mal_ganis(Creature *_Creature) +CreatureAI* GetAI_boss_mal_ganis(Creature* pCreature) { - return new boss_mal_ganisAI (_Creature); + return new boss_mal_ganisAI (pCreature); } void AddSC_boss_mal_ganis() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp index dc39bd49cec..117a17585c6 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp @@ -122,9 +122,9 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_meathook(Creature *_Creature) +CreatureAI* GetAI_boss_meathook(Creature* pCreature) { - return new boss_meathookAI (_Creature); + return new boss_meathookAI (pCreature); } void AddSC_boss_meathook() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp index e466f7ebe50..418adb82ff4 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp @@ -139,9 +139,9 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_salramm(Creature *_Creature) +CreatureAI* GetAI_boss_salramm(Creature* pCreature) { - return new boss_salrammAI (_Creature); + return new boss_salrammAI (pCreature); } void AddSC_boss_salramm() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp index 69b8282da1e..5667f5ae0b1 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -135,9 +135,9 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_aeonus(Creature *_Creature) +CreatureAI* GetAI_boss_aeonus(Creature* pCreature) { - return new boss_aeonusAI (_Creature); + return new boss_aeonusAI (pCreature); } void AddSC_boss_aeonus() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index 47a3e754eb3..2a1d3c4fe03 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -144,9 +144,9 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_chrono_lord_deja(Creature *_Creature) +CreatureAI* GetAI_boss_chrono_lord_deja(Creature* pCreature) { - return new boss_chrono_lord_dejaAI (_Creature); + return new boss_chrono_lord_dejaAI (pCreature); } void AddSC_boss_chrono_lord_deja() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp index a2e28a19d5b..0d1a6eec214 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp @@ -142,9 +142,9 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_temporus(Creature *_Creature) +CreatureAI* GetAI_boss_temporus(Creature* pCreature) { - return new boss_temporusAI (_Creature); + return new boss_temporusAI (pCreature); } void AddSC_boss_temporus() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp index 558bff3bac3..759ce912da2 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp @@ -223,9 +223,9 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_medivh_bm(Creature *_Creature) +CreatureAI* GetAI_npc_medivh_bm(Creature* pCreature) { - return new npc_medivh_bmAI (_Creature); + return new npc_medivh_bmAI (pCreature); } struct Wave @@ -343,9 +343,9 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_time_rift(Creature *_Creature) +CreatureAI* GetAI_npc_time_rift(Creature* pCreature) { - return new npc_time_riftAI (_Creature); + return new npc_time_riftAI (pCreature); } #define SAY_SAAT_WELCOME -1269019 @@ -354,34 +354,34 @@ CreatureAI* GetAI_npc_time_rift(Creature *_Creature) #define SPELL_CHRONO_BEACON 34975 #define ITEM_CHRONO_BEACON 24289 -bool GossipHello_npc_saat(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_saat(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10000,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10000, pCreature->GetGUID()); return true; } else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10001,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10001, pCreature->GetGUID()); return true; } - pPlayer->SEND_GOSSIP_MENU(10002,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10002, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_saat(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_saat(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false); + pCreature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false); } return true; } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp index c6458fef706..bf860af497c 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp @@ -213,9 +213,9 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI } }; -CreatureAI* GetAI_boss_anetheron(Creature *_Creature) +CreatureAI* GetAI_boss_anetheron(Creature* pCreature) { - return new boss_anetheronAI (_Creature); + return new boss_anetheronAI (pCreature); } #define SPELL_IMMOLATION 31303 @@ -294,9 +294,9 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_towering_infernal(Creature *_Creature) +CreatureAI* GetAI_mob_towering_infernal(Creature* pCreature) { - return new mob_towering_infernalAI (_Creature); + return new mob_towering_infernalAI (pCreature); } void AddSC_boss_anetheron() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp index 4dd20a385bd..87b4d64e3a6 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp @@ -595,24 +595,24 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI void WaypointReached(uint32 i){} }; -CreatureAI* GetAI_boss_archimonde(Creature *_Creature) +CreatureAI* GetAI_boss_archimonde(Creature* pCreature) { - return new boss_archimondeAI (_Creature); + return new boss_archimondeAI (pCreature); } -CreatureAI* GetAI_mob_doomfire(Creature* _Creature) +CreatureAI* GetAI_mob_doomfire(Creature* pCreature) { - return new mob_doomfireAI(_Creature); + return new mob_doomfireAI(pCreature); } -CreatureAI* GetAI_mob_doomfire_targetting(Creature* _Creature) +CreatureAI* GetAI_mob_doomfire_targetting(Creature* pCreature) { - return new mob_doomfire_targettingAI(_Creature); + return new mob_doomfire_targettingAI(pCreature); } -CreatureAI* GetAI_mob_ancient_wisp(Creature* _Creature) +CreatureAI* GetAI_mob_ancient_wisp(Creature* pCreature) { - return new mob_ancient_wispAI(_Creature); + return new mob_ancient_wispAI(pCreature); } void AddSC_boss_archimonde() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp index 3de3fbb568d..aef087dfb23 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp @@ -174,9 +174,9 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI } }; -CreatureAI* GetAI_boss_azgalor(Creature *_Creature) +CreatureAI* GetAI_boss_azgalor(Creature* pCreature) { - return new boss_azgalorAI (_Creature); + return new boss_azgalorAI (pCreature); } #define SPELL_THRASH 12787 @@ -268,9 +268,9 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI } }; -CreatureAI* GetAI_mob_lesser_doomguard(Creature *_Creature) +CreatureAI* GetAI_mob_lesser_doomguard(Creature* pCreature) { - return new mob_lesser_doomguardAI (_Creature); + return new mob_lesser_doomguardAI (pCreature); } void AddSC_boss_azgalor() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp index 20d04223a8e..8806e28849c 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp @@ -182,9 +182,9 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI } }; -CreatureAI* GetAI_boss_kazrogal(Creature *_Creature) +CreatureAI* GetAI_boss_kazrogal(Creature* pCreature) { - return new boss_kazrogalAI (_Creature); + return new boss_kazrogalAI (pCreature); } void AddSC_boss_kazrogal() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp index a503d1905c3..f8a50e4b1da 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp @@ -177,9 +177,9 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI } }; -CreatureAI* GetAI_boss_rage_winterchill(Creature *_Creature) +CreatureAI* GetAI_boss_rage_winterchill(Creature* pCreature) { - return new boss_rage_winterchillAI (_Creature); + return new boss_rage_winterchillAI (pCreature); } void AddSC_boss_rage_winterchill() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp index a61d1f98d85..335d7019de0 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp @@ -42,9 +42,9 @@ EndContentData */ #define ITEM_TEAR_OF_GODDESS 24494 -CreatureAI* GetAI_npc_jaina_proudmoore(Creature *_Creature) +CreatureAI* GetAI_npc_jaina_proudmoore(Creature* pCreature) { - hyjalAI* ai = new hyjalAI(_Creature); + hyjalAI* ai = new hyjalAI(pCreature); ai->Reset(); ai->EnterEvadeMode(); @@ -64,9 +64,9 @@ CreatureAI* GetAI_npc_jaina_proudmoore(Creature *_Creature) return ai; } -bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature) { - hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); if (ai->EventBegun) return false; @@ -82,13 +82,13 @@ bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature *_Creature) if (pPlayer->isGameMaster()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { - hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); switch(action) { case GOSSIP_ACTION_INFO_DEF + 1: @@ -110,9 +110,9 @@ bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature *_Creature, uin return true; } -CreatureAI* GetAI_npc_thrall(Creature *_Creature) +CreatureAI* GetAI_npc_thrall(Creature* pCreature) { - hyjalAI* ai = new hyjalAI(_Creature); + hyjalAI* ai = new hyjalAI(pCreature); ai->Reset(); ai->EnterEvadeMode(); @@ -128,9 +128,9 @@ CreatureAI* GetAI_npc_thrall(Creature *_Creature) return ai; } -bool GossipHello_npc_thrall(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_thrall(Player* pPlayer, Creature* pCreature) { - hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); if (ai->EventBegun) return false; @@ -151,13 +151,13 @@ bool GossipHello_npc_thrall(Player* pPlayer, Creature *_Creature) if (pPlayer->isGameMaster()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_thrall(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { - hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); ai->DeSpawnVeins();//despawn the alliance veins switch(action) { @@ -180,27 +180,27 @@ bool GossipSelect_npc_thrall(Player* pPlayer, Creature *_Creature, uint32 sender return true; } -CreatureAI* GetAI_npc_tyrande_whisperwind(Creature *_Creature) +CreatureAI* GetAI_npc_tyrande_whisperwind(Creature* pCreature) { - hyjalAI* ai = new hyjalAI(_Creature); + hyjalAI* ai = new hyjalAI(pCreature); ai->Reset(); ai->EnterEvadeMode(); return ai; } -bool GossipHello_npc_tyrande_whisperwind(Player* pPlayer, Creature* _Creature) +bool GossipHello_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature) { - hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); // Only let them get item if Azgalor is dead. if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS,1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) { @@ -212,8 +212,8 @@ bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature *_Creature, if (item && pPlayer) pPlayer->SendNewItem(item,1,true,false,true); } - pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); - hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); } return true; } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp index 7221fc36cde..dbcd1064fa6 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp @@ -497,9 +497,9 @@ struct mob_giant_infernalAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_giant_infernal(Creature* _Creature) +CreatureAI* GetAI_mob_giant_infernal(Creature* pCreature) { - return new mob_giant_infernalAI(_Creature); + return new mob_giant_infernalAI(pCreature); } #define SPELL_DISEASE_CLOUD 31607 @@ -593,9 +593,9 @@ struct mob_abominationAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_abomination(Creature* _Creature) +CreatureAI* GetAI_mob_abomination(Creature* pCreature) { - return new mob_abominationAI(_Creature); + return new mob_abominationAI(pCreature); } #define SPELL_FRENZY 31540 @@ -693,9 +693,9 @@ struct mob_ghoulAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_ghoul(Creature* _Creature) +CreatureAI* GetAI_mob_ghoul(Creature* pCreature) { - return new mob_ghoulAI(_Creature); + return new mob_ghoulAI(pCreature); } #define SPELL_RAISE_DEAD_1 31617 @@ -812,9 +812,9 @@ struct mob_necromancerAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_necromancer(Creature* _Creature) +CreatureAI* GetAI_mob_necromancer(Creature* pCreature) { - return new mob_necromancerAI(_Creature); + return new mob_necromancerAI(pCreature); } #define SPELL_BANSHEE_CURSE 31651 @@ -913,9 +913,9 @@ struct mob_bansheeAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_banshee(Creature* _Creature) +CreatureAI* GetAI_mob_banshee(Creature* pCreature) { - return new mob_bansheeAI(_Creature); + return new mob_bansheeAI(pCreature); } #define SPELL_WEB 28991 @@ -999,9 +999,9 @@ struct mob_crypt_fiendAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_crypt_fiend(Creature* _Creature) +CreatureAI* GetAI_mob_crypt_fiend(Creature* pCreature) { - return new mob_crypt_fiendAI(_Creature); + return new mob_crypt_fiendAI(pCreature); } #define SPELL_MANA_BURN 31729 @@ -1085,9 +1085,9 @@ struct mob_fel_stalkerAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_fel_stalker(Creature* _Creature) +CreatureAI* GetAI_mob_fel_stalker(Creature* pCreature) { - return new mob_fel_stalkerAI(_Creature); + return new mob_fel_stalkerAI(pCreature); } #define SPELL_FROST_BREATH 31688 @@ -1196,9 +1196,9 @@ struct mob_frost_wyrmAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_frost_wyrm(Creature* _Creature) +CreatureAI* GetAI_mob_frost_wyrm(Creature* pCreature) { - return new mob_frost_wyrmAI(_Creature); + return new mob_frost_wyrmAI(pCreature); } #define SPELL_GARGOYLE_STRIKE 31664 @@ -1330,9 +1330,9 @@ struct mob_gargoyleAI : public hyjal_trashAI }; -CreatureAI* GetAI_mob_gargoyle(Creature* _Creature) +CreatureAI* GetAI_mob_gargoyle(Creature* pCreature) { - return new mob_gargoyleAI(_Creature); + return new mob_gargoyleAI(pCreature); } #define SPELL_EXPLODING_SHOT 7896 @@ -1394,9 +1394,9 @@ struct TRINITY_DLL_DECL alliance_riflemanAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_alliance_rifleman(Creature* _Creature) +CreatureAI* GetAI_alliance_rifleman(Creature* pCreature) { - return new alliance_riflemanAI(_Creature); + return new alliance_riflemanAI(pCreature); } void AddSC_hyjal_trash() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp index cac636c402d..0c6c98d9758 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp @@ -140,9 +140,9 @@ struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_captain_skarloc(Creature *_Creature) +CreatureAI* GetAI_boss_captain_skarloc(Creature* pCreature) { - return new boss_captain_skarlocAI (_Creature); + return new boss_captain_skarlocAI (pCreature); } void AddSC_boss_captain_skarloc() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp index af3784f344c..138a59cce93 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp @@ -134,9 +134,9 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_epoch_hunter(Creature *_Creature) +CreatureAI* GetAI_boss_epoch_hunter(Creature* pCreature) { - return new boss_epoch_hunterAI (_Creature); + return new boss_epoch_hunterAI (pCreature); } void AddSC_boss_epoch_hunter() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp index f48b83d4567..f5529f3480f 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp @@ -174,9 +174,9 @@ struct TRINITY_DLL_DECL boss_lieutenant_drakeAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_lieutenant_drake(Creature *_Creature) +CreatureAI* GetAI_boss_lieutenant_drake(Creature* pCreature) { - return new boss_lieutenant_drakeAI (_Creature); + return new boss_lieutenant_drakeAI (pCreature); } void AddSC_boss_lieutenant_drake() diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index 8ca019c077f..cdc9c5f1652 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -41,24 +41,24 @@ EndContentData */ ## npc_erozion ######*/ -bool GossipHello_npc_erozion(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_erozion(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - ScriptedInstance* pInstance = (_Creature->GetInstanceData()); + ScriptedInstance* pInstance = (pCreature->GetInstanceData()); if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need a pack of Incendiary Bombs.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (!pPlayer->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Teleport please, i'm tired.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(9778, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9778, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_erozion(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { @@ -68,7 +68,7 @@ bool GossipSelect_npc_erozion(Player* pPlayer, Creature *_Creature, uint32 sende { pPlayer->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true); } - pPlayer->SEND_GOSSIP_MENU(9515, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9515, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF+2) { @@ -481,50 +481,50 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI } }; -CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature *_Creature) +CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature* pCreature) { - npc_thrall_old_hillsbradAI* thrall_walkAI = new npc_thrall_old_hillsbradAI(_Creature); + npc_thrall_old_hillsbradAI* thrall_walkAI = new npc_thrall_old_hillsbradAI(pCreature); thrall_walkAI->FillPointMovementListForCreature(); return thrall_walkAI; } -bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) + if (pCreature->isQuestGiver()) { - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - pPlayer->SendPreparedQuest(_Creature->GetGUID()); + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + pPlayer->SendPreparedQuest(pCreature->GetGUID()); } - ScriptedInstance* pInstance = (_Creature->GetInstanceData()); + ScriptedInstance* pInstance = (pCreature->GetInstanceData()); if (pInstance) { if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Start walking.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, pCreature->GetGUID()); } if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, pCreature->GetGUID()); } if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, pCreature->GetGUID()); } } return true; } -bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { - ScriptedInstance* pInstance = (_Creature->GetInstanceData()); + ScriptedInstance* pInstance = (pCreature->GetInstanceData()); switch(action) { case GOSSIP_ACTION_INFO_DEF+1: @@ -535,35 +535,35 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature *_Creature, pInstance->SetData(TYPE_THRALL_PART1,IN_PROGRESS); } - DoScriptText(SAY_TH_START_EVENT_PART1, _Creature); + DoScriptText(SAY_TH_START_EVENT_PART1, pCreature); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, pPlayer->GetGUID()); - CAST_AI(npc_escortAI, (_Creature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far - CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtEnd(false); - CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtFar(false); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, true, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (pCreature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far + CAST_AI(npc_escortAI, (pCreature->AI()))->SetDespawnAtEnd(false); + CAST_AI(npc_escortAI, (pCreature->AI()))->SetDespawnAtFar(false); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+20: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, _Creature->GetGUID()); - _Creature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, pCreature->GetGUID()); + pCreature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000); if (pInstance) pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); - DoScriptText(SAY_TH_START_EVENT_PART2, _Creature); + DoScriptText(SAY_TH_START_EVENT_PART2, pCreature); - CAST_AI(npc_thrall_old_hillsbradAI, _Creature->AI())->StartWP(); + CAST_AI(npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance) pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS); - CAST_AI(npc_thrall_old_hillsbradAI, _Creature->AI())->StartWP(); + CAST_AI(npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); break; } return true; @@ -607,33 +607,33 @@ struct TRINITY_DLL_DECL npc_tarethaAI : public npc_escortAI npc_escortAI::UpdateAI(diff); } }; -CreatureAI* GetAI_npc_taretha(Creature *_Creature) +CreatureAI* GetAI_npc_taretha(Creature* pCreature) { - npc_tarethaAI* taretha_walkAI = new npc_tarethaAI(_Creature); + npc_tarethaAI* taretha_walkAI = new npc_tarethaAI(pCreature); taretha_walkAI->FillPointMovementListForCreature(); return taretha_walkAI; } -bool GossipHello_npc_taretha(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_taretha(Player* pPlayer, Creature* pCreature) { - ScriptedInstance* pInstance = (_Creature->GetInstanceData()); + ScriptedInstance* pInstance = (pCreature->GetInstanceData()); if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, pCreature->GetGUID()); } return true; } -bool GossipSelect_npc_taretha(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_taretha(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { - ScriptedInstance* pInstance = (_Creature->GetInstanceData()); + ScriptedInstance* pInstance = (pCreature->GetInstanceData()); if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF+2) { @@ -644,11 +644,11 @@ bool GossipSelect_npc_taretha(Player* pPlayer, Creature *_Creature, uint32 sende if (pInstance) pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS); if (pInstance->GetData64(DATA_EPOCH) == 0) - _Creature->SummonCreature(ENTRY_EPOCH,2639.13,698.55,65.43,4.59,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + pCreature->SummonCreature(ENTRY_EPOCH,2639.13,698.55,65.43,4.59,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) { - Creature* Thrall = (Unit::GetCreature((*_Creature), ThrallGUID)); + Creature* Thrall = (Unit::GetCreature((*pCreature), ThrallGUID)); if (Thrall) CAST_AI(npc_thrall_old_hillsbradAI, Thrall->AI())->StartWP(); } diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index 1c0f77af73c..f17b01774ab 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -713,24 +713,24 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_fathomlord_karathress(Creature *_Creature) +CreatureAI* GetAI_boss_fathomlord_karathress(Creature* pCreature) { - return new boss_fathomlord_karathressAI (_Creature); + return new boss_fathomlord_karathressAI (pCreature); } -CreatureAI* GetAI_boss_fathomguard_sharkkis(Creature *_Creature) +CreatureAI* GetAI_boss_fathomguard_sharkkis(Creature* pCreature) { - return new boss_fathomguard_sharkkisAI (_Creature); + return new boss_fathomguard_sharkkisAI (pCreature); } -CreatureAI* GetAI_boss_fathomguard_tidalvess(Creature *_Creature) +CreatureAI* GetAI_boss_fathomguard_tidalvess(Creature* pCreature) { - return new boss_fathomguard_tidalvessAI (_Creature); + return new boss_fathomguard_tidalvessAI (pCreature); } -CreatureAI* GetAI_boss_fathomguard_caribdis(Creature *_Creature) +CreatureAI* GetAI_boss_fathomguard_caribdis(Creature* pCreature) { - return new boss_fathomguard_caribdisAI (_Creature); + return new boss_fathomguard_caribdisAI (pCreature); } void AddSC_boss_fathomlord_karathress() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index a6ae11b069d..434e088cd99 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -370,9 +370,9 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_hydross_the_unstable(Creature *_Creature) +CreatureAI* GetAI_boss_hydross_the_unstable(Creature* pCreature) { - return new boss_hydross_the_unstableAI (_Creature); + return new boss_hydross_the_unstableAI (pCreature); } void AddSC_boss_hydross_the_unstable() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 990905f3133..44b38373bfb 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -839,9 +839,9 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI //Coilfang Elite //It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage -CreatureAI* GetAI_mob_coilfang_elite(Creature *_Creature) +CreatureAI* GetAI_mob_coilfang_elite(Creature* pCreature) { - SimpleAI* ai = new SimpleAI (_Creature); + SimpleAI* ai = new SimpleAI (pCreature); ai->Spell[0].Enabled = true; ai->Spell[0].Spell_Id = 31345; //Cleave @@ -857,9 +857,9 @@ CreatureAI* GetAI_mob_coilfang_elite(Creature *_Creature) //Coilfang Strider //It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds , for 5 seconds and increasing their movement speed by 150% during the fear. -CreatureAI* GetAI_mob_coilfang_strider(Creature *_Creature) +CreatureAI* GetAI_mob_coilfang_strider(Creature* pCreature) { - SimpleAI* ai = new SimpleAI (_Creature); + SimpleAI* ai = new SimpleAI (pCreature); ai->Spell[0].Enabled = true; ai->Spell[0].Spell_Id = 41374; //Mind Blast @@ -995,29 +995,29 @@ bool ItemUse_item_tainted_core(Player* pPlayer, Item* _Item, SpellCastTargets co return true; } -CreatureAI* GetAI_boss_lady_vashj(Creature *_Creature) +CreatureAI* GetAI_boss_lady_vashj(Creature* pCreature) { - return new boss_lady_vashjAI (_Creature); + return new boss_lady_vashjAI (pCreature); } -CreatureAI* GetAI_mob_enchanted_elemental(Creature *_Creature) +CreatureAI* GetAI_mob_enchanted_elemental(Creature* pCreature) { - return new mob_enchanted_elementalAI (_Creature); + return new mob_enchanted_elementalAI (pCreature); } -CreatureAI* GetAI_mob_tainted_elemental(Creature *_Creature) +CreatureAI* GetAI_mob_tainted_elemental(Creature* pCreature) { - return new mob_tainted_elementalAI (_Creature); + return new mob_tainted_elementalAI (pCreature); } -CreatureAI* GetAI_mob_toxic_sporebat(Creature *_Creature) +CreatureAI* GetAI_mob_toxic_sporebat(Creature* pCreature) { - return new mob_toxic_sporebatAI (_Creature); + return new mob_toxic_sporebatAI (pCreature); } -CreatureAI* GetAI_mob_shield_generator_channel(Creature *_Creature) +CreatureAI* GetAI_mob_shield_generator_channel(Creature* pCreature) { - return new mob_shield_generator_channelAI (_Creature); + return new mob_shield_generator_channelAI (pCreature); } void AddSC_boss_lady_vashj() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 8355c46d9ef..4c4fa0663e5 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -762,24 +762,24 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI void JustDied(Unit *killer) {} }; -CreatureAI* GetAI_boss_leotheras_the_blind(Creature *_Creature) +CreatureAI* GetAI_boss_leotheras_the_blind(Creature* pCreature) { - return new boss_leotheras_the_blindAI (_Creature); + return new boss_leotheras_the_blindAI (pCreature); } -CreatureAI* GetAI_boss_leotheras_the_blind_demonform(Creature *_Creature) +CreatureAI* GetAI_boss_leotheras_the_blind_demonform(Creature* pCreature) { - return new boss_leotheras_the_blind_demonformAI (_Creature); + return new boss_leotheras_the_blind_demonformAI (pCreature); } -CreatureAI* GetAI_mob_greyheart_spellbinder(Creature *_Creature) +CreatureAI* GetAI_mob_greyheart_spellbinder(Creature* pCreature) { - return new mob_greyheart_spellbinderAI (_Creature); + return new mob_greyheart_spellbinderAI (pCreature); } -CreatureAI* GetAI_mob_inner_demon(Creature *_Creature) +CreatureAI* GetAI_mob_inner_demon(Creature* pCreature) { - return new mob_inner_demonAI (_Creature); + return new mob_inner_demonAI (pCreature); } void AddSC_boss_leotheras_the_blind() { diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index 4b8c2169a93..073af7212ec 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -380,9 +380,9 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_mob_coilfang_guardian(Creature *_Creature) +CreatureAI* GetAI_mob_coilfang_guardian(Creature* pCreature) { - SimpleAI* ai = new SimpleAI (_Creature); + SimpleAI* ai = new SimpleAI (pCreature); ai->Spell[0].Enabled = true; ai->Spell[0].Spell_Id = SPELL_ARCINGSMASH; @@ -457,14 +457,14 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_mob_coilfang_ambusher(Creature *_Creature) +CreatureAI* GetAI_mob_coilfang_ambusher(Creature* pCreature) { - return new mob_coilfang_ambusherAI (_Creature); + return new mob_coilfang_ambusherAI (pCreature); } -CreatureAI* GetAI_boss_the_lurker_below(Creature *_Creature) +CreatureAI* GetAI_boss_the_lurker_below(Creature* pCreature) { - return new boss_the_lurker_belowAI (_Creature); + return new boss_the_lurker_belowAI (pCreature); } void AddSC_boss_the_lurker_below() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index d248d9dd658..80e05cc494b 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -346,13 +346,13 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_morogrim_tidewalker(Creature *_Creature) +CreatureAI* GetAI_boss_morogrim_tidewalker(Creature* pCreature) { - return new boss_morogrim_tidewalkerAI (_Creature); + return new boss_morogrim_tidewalkerAI (pCreature); } -CreatureAI* GetAI_mob_water_globule(Creature *_Creature) +CreatureAI* GetAI_mob_water_globule(Creature* pCreature) { - return new mob_water_globuleAI (_Creature); + return new mob_water_globuleAI (pCreature); } void AddSC_boss_morogrim_tidewalker() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp index 3143f8dfe1c..3bec4de6876 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp @@ -170,14 +170,14 @@ struct TRINITY_DLL_DECL mob_coilfang_waterelementalAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_thespiaAI(Creature *_Creature) +CreatureAI* GetAI_boss_thespiaAI(Creature* pCreature) { - return new boss_thespiaAI (_Creature); + return new boss_thespiaAI (pCreature); } -CreatureAI* GetAI_mob_coilfang_waterelementalAI(Creature *_Creature) +CreatureAI* GetAI_mob_coilfang_waterelementalAI(Creature* pCreature) { - return new mob_coilfang_waterelementalAI (_Creature); + return new mob_coilfang_waterelementalAI (pCreature); } void AddSC_boss_hydromancer_thespia() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 3d046da4a9d..d8cc2e0ef47 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -183,9 +183,9 @@ struct TRINITY_DLL_DECL boss_mekgineer_steamriggerAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_mekgineer_steamrigger(Creature *_Creature) +CreatureAI* GetAI_boss_mekgineer_steamrigger(Creature* pCreature) { - return new boss_mekgineer_steamriggerAI (_Creature); + return new boss_mekgineer_steamriggerAI (pCreature); } #define SPELL_DISPEL_MAGIC 17201 @@ -257,9 +257,9 @@ struct TRINITY_DLL_DECL mob_steamrigger_mechanicAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_steamrigger_mechanic(Creature *_Creature) +CreatureAI* GetAI_mob_steamrigger_mechanic(Creature* pCreature) { - return new mob_steamrigger_mechanicAI (_Creature); + return new mob_steamrigger_mechanicAI (pCreature); } void AddSC_boss_mekgineer_steamrigger() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp index 49209dc7193..0f4f2689398 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp @@ -186,14 +186,14 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_naga_distiller(Creature *_Creature) +CreatureAI* GetAI_mob_naga_distiller(Creature* pCreature) { - return new mob_naga_distillerAI (_Creature); + return new mob_naga_distillerAI (pCreature); } -CreatureAI* GetAI_boss_warlord_kalithresh(Creature *_Creature) +CreatureAI* GetAI_boss_warlord_kalithresh(Creature* pCreature) { - return new boss_warlord_kalithreshAI (_Creature); + return new boss_warlord_kalithreshAI (pCreature); } void AddSC_boss_warlord_kalithresh() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp index 8c05801ffd0..309c63d857e 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp @@ -83,9 +83,9 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_hungarfen(Creature *_Creature) +CreatureAI* GetAI_boss_hungarfen(Creature* pCreature) { - return new boss_hungarfenAI (_Creature); + return new boss_hungarfenAI (pCreature); } #define SPELL_SPORE_CLOUD 34168 @@ -134,9 +134,9 @@ struct TRINITY_DLL_DECL mob_underbog_mushroomAI : public ScriptedAI }else Shrink_Timer -= diff; } }; -CreatureAI* GetAI_mob_underbog_mushroom(Creature *_Creature) +CreatureAI* GetAI_mob_underbog_mushroom(Creature* pCreature) { - return new mob_underbog_mushroomAI (_Creature); + return new mob_underbog_mushroomAI (pCreature); } void AddSC_boss_hungarfen() diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index adcaac75a4e..6da2a022adf 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -174,9 +174,9 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_the_black_stalker(Creature *_Creature) +CreatureAI* GetAI_boss_the_black_stalker(Creature* pCreature) { - return new boss_the_black_stalkerAI (_Creature); + return new boss_the_black_stalkerAI (pCreature); } void AddSC_boss_the_black_stalker() diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp index eb420cb98a6..98425a29e1a 100644 --- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp +++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp @@ -40,9 +40,9 @@ struct TRINITY_DLL_DECL boss_dredAI : public ScriptedAI void JustDied(Unit* killer) {} }; -CreatureAI* GetAI_boss_dred(Creature *_Creature) +CreatureAI* GetAI_boss_dred(Creature* pCreature) { - return new boss_dredAI (_Creature); + return new boss_dredAI (pCreature); } void AddSC_boss_dred() diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp index 4198a0542a3..2f1cc7d22fc 100644 --- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp +++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp @@ -59,9 +59,9 @@ struct TRINITY_DLL_DECL boss_novosAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_novos(Creature *_Creature) +CreatureAI* GetAI_boss_novos(Creature* pCreature) { - return new boss_novosAI (_Creature); + return new boss_novosAI (pCreature); } void AddSC_boss_novos() diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp index 84921b17f1a..62d724f4de4 100644 --- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp +++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp @@ -72,9 +72,9 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_tharon_ja(Creature *_Creature) +CreatureAI* GetAI_boss_tharon_ja(Creature* pCreature) { - return new boss_tharon_jaAI (_Creature); + return new boss_tharon_jaAI (pCreature); } void AddSC_boss_tharon_ja() diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp index 3ae5246a250..59f68c37205 100644 --- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp +++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp @@ -59,9 +59,9 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_trollgore(Creature *_Creature) +CreatureAI* GetAI_boss_trollgore(Creature* pCreature) { - return new boss_trollgoreAI (_Creature); + return new boss_trollgoreAI (pCreature); } void AddSC_boss_trollgore() diff --git a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp index e04ce0f10b0..7e61df13575 100644 --- a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp +++ b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp @@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_narm_faulk(Creature *_Creature) +CreatureAI* GetAI_npc_narm_faulk(Creature* pCreature) { - return new npc_narm_faulkAI (_Creature); + return new npc_narm_faulkAI (pCreature); } void AddSC_dun_morogh() diff --git a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp index 688a5663993..fed577cb4c8 100644 --- a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp +++ b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp @@ -83,21 +83,21 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_mobs_risen_husk_spirit(Creature *_Creature) +CreatureAI* GetAI_mobs_risen_husk_spirit(Creature* pCreature) { - return new mobs_risen_husk_spiritAI (_Creature); + return new mobs_risen_husk_spiritAI (pCreature); } /*###### ## npc_restless_apparition ######*/ -bool GossipHello_npc_restless_apparition(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_restless_apparition(Player* pPlayer, Creature* pCreature) { - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); - pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); - _Creature->SetInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); + pCreature->SetInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return true; } @@ -118,20 +118,20 @@ struct TRINITY_DLL_DECL npc_deserter_agitatorAI : public ScriptedAI void EnterCombat(Unit* who) {} }; -CreatureAI* GetAI_npc_deserter_agitator(Creature *_Creature) +CreatureAI* GetAI_npc_deserter_agitator(Creature* pCreature) { - return new npc_deserter_agitatorAI (_Creature); + return new npc_deserter_agitatorAI (pCreature); } -bool GossipHello_npc_deserter_agitator(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_deserter_agitator(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(11126) == QUEST_STATUS_INCOMPLETE) { - _Creature->setFaction(1883); - pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); + pCreature->setFaction(1883); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } @@ -142,24 +142,24 @@ bool GossipHello_npc_deserter_agitator(Player* pPlayer, Creature *_Creature) #define GOSSIP_ITEM_JAINA "I know this is rather silly but i have a young ward who is a bit shy and would like your autograph." -bool GossipHello_npc_lady_jaina_proudmoore(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_lady_jaina_proudmoore(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(558) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_lady_jaina_proudmoore(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_lady_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_SENDER_INFO) { - pPlayer->SEND_GOSSIP_MENU(7012, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7012, pCreature->GetGUID()); pPlayer->CastSpell(pPlayer, 23122, false); } return true; @@ -169,26 +169,26 @@ bool GossipSelect_npc_lady_jaina_proudmoore(Player* pPlayer, Creature *_Creature ## npc_nat_pagle ######*/ -bool GossipHello_npc_nat_pagle(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_nat_pagle(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(8227)) + if (pCreature->isVendor() && pPlayer->GetQuestRewardStatus(8227)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(7640, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7640, pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(7638, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7638, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_nat_pagle(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_nat_pagle(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp index 5ae64dff709..c728ebd15e9 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp @@ -49,31 +49,31 @@ struct TRINITY_DLL_DECL mobs_ghoul_flayerAI : public ScriptedAI } }; -CreatureAI* GetAI_mobs_ghoul_flayer(Creature *_Creature) +CreatureAI* GetAI_mobs_ghoul_flayer(Creature* pCreature) { - return new mobs_ghoul_flayerAI (_Creature); + return new mobs_ghoul_flayerAI (pCreature); } /*###### ## npc_augustus_the_touched ######*/ -bool GossipHello_npc_augustus_the_touched(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(6164)) + if (pCreature->isVendor() && pPlayer->GetQuestRewardStatus(6164)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -96,16 +96,16 @@ struct TRINITY_DLL_DECL npc_darrowshire_spiritAI : public ScriptedAI void EnterCombat(Unit *who) { } }; -CreatureAI* GetAI_npc_darrowshire_spirit(Creature *_Creature) +CreatureAI* GetAI_npc_darrowshire_spirit(Creature* pCreature) { - return new npc_darrowshire_spiritAI (_Creature); + return new npc_darrowshire_spiritAI (pCreature); } -bool GossipHello_npc_darrowshire_spirit(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_darrowshire_spirit(Player* pPlayer, Creature* pCreature) { - pPlayer->SEND_GOSSIP_MENU(3873,_Creature->GetGUID()); - pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); - _Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pPlayer->SEND_GOSSIP_MENU(3873, pCreature->GetGUID()); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return true; } @@ -113,34 +113,34 @@ bool GossipHello_npc_darrowshire_spirit(Player* pPlayer, Creature *_Creature) ## npc_tirion_fordring ######*/ -bool GossipHello_npc_tirion_fordring(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_tirion_fordring(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && pPlayer->getStandState() == UNIT_STAND_STATE_SIT) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to hear your tale, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_tirion_fordring(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_tirion_fordring(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thank you, Tirion. What of your identity?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(4493, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4493, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "That is terrible.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(4494, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4494, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(4495, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4495, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp index 3fca340a7b3..d39de297bf7 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp @@ -807,9 +807,9 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI void UpdateAI(const uint32 diff); }; -CreatureAI* GetAI_npc_unworthy_initiate(Creature *_Creature) +CreatureAI* GetAI_npc_unworthy_initiate(Creature* pCreature) { - return new npc_unworthy_initiateAI(_Creature); + return new npc_unworthy_initiateAI(pCreature); } struct TRINITY_DLL_DECL npc_unworthy_initiate_anchorAI : public PassiveAI @@ -927,9 +927,9 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff) } } -CreatureAI* GetAI_npc_unworthy_initiate_anchor(Creature *_Creature) +CreatureAI* GetAI_npc_unworthy_initiate_anchor(Creature* pCreature) { - return new npc_unworthy_initiate_anchorAI(_Creature); + return new npc_unworthy_initiate_anchorAI(pCreature); } bool GOHello_go_acherus_soul_prison(Player* pPlayer, GameObject* go) @@ -1193,9 +1193,9 @@ struct TRINITY_DLL_DECL npc_dark_rider_of_acherusAI : public ScriptedAI }; -CreatureAI* GetAI_npc_dark_rider_of_acherus(Creature *_Creature) +CreatureAI* GetAI_npc_dark_rider_of_acherus(Creature* pCreature) { - return new npc_dark_rider_of_acherusAI(_Creature); + return new npc_dark_rider_of_acherusAI(pCreature); } /*###### @@ -1264,9 +1264,9 @@ struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_salanar_the_horseman(Creature *_Creature) +CreatureAI* GetAI_npc_salanar_the_horseman(Creature* pCreature) { - return new npc_salanar_the_horsemanAI(_Creature); + return new npc_salanar_the_horsemanAI(pCreature); } /*###### @@ -1306,9 +1306,9 @@ struct TRINITY_DLL_DECL npc_ros_dark_riderAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_ros_dark_rider(Creature *_Creature) +CreatureAI* GetAI_npc_ros_dark_rider(Creature* pCreature) { - return new npc_ros_dark_riderAI(_Creature); + return new npc_ros_dark_riderAI(pCreature); } // correct way: 52312 52314 52555 ... @@ -1337,9 +1337,9 @@ struct TRINITY_DLL_DECL npc_dkc1_gothikAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_dkc1_gothik(Creature *_Creature) +CreatureAI* GetAI_npc_dkc1_gothik(Creature* pCreature) { - return new npc_dkc1_gothikAI(_Creature); + return new npc_dkc1_gothikAI(pCreature); } // npc 28912 quest 17217 boss 29001 mob 29007 go 191092 @@ -1440,9 +1440,9 @@ struct TRINITY_DLL_DECL npc_valkyr_battle_maidenAI : public ScriptedAI }; -CreatureAI* GetAI_npc_valkyr_battle_maiden(Creature *_Creature) +CreatureAI* GetAI_npc_valkyr_battle_maiden(Creature* pCreature) { - return new npc_valkyr_battle_maidenAI (_Creature); + return new npc_valkyr_battle_maidenAI (pCreature); } void AddSC_the_scarlet_enclave() diff --git a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp index b19ad15b6e0..67456755cd2 100644 --- a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp +++ b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp @@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_henze_faulk(Creature *_Creature) +CreatureAI* GetAI_npc_henze_faulk(Creature* pCreature) { - return new npc_henze_faulkAI (_Creature); + return new npc_henze_faulkAI (pCreature); } void AddSC_elwynn_forest() diff --git a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp index f921e2cec7a..fc0ddd6a51f 100644 --- a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp @@ -92,26 +92,26 @@ CreatureAI* GetAI_npc_prospector_anvilward(Creature* pCreature) return thisAI; } -bool GossipHello_npc_prospector_anvilward(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(8239, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8239, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_prospector_anvilward(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(8240, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8240, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); break; } return true; @@ -398,19 +398,19 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI }; -bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature *_Creature) +bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature* pCreature) { // quest only available if not already started // Quest_template flag is set to : QUEST_FLAGS_EVENT // Escort quests or any other event-driven quests. If player in party, all players that can accept this quest will receive confirmation box to accept quest. // !not sure if this really works! - if (CAST_AI(master_kelerun_bloodmournAI, _Creature->AI())->questPhase == 0) { - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - pPlayer->SendPreparedQuest(_Creature->GetGUID()); + if (CAST_AI(master_kelerun_bloodmournAI, pCreature->AI())->questPhase == 0) { + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + pPlayer->SendPreparedQuest(pCreature->GetGUID()); } - pPlayer->SEND_GOSSIP_MENU(_Creature->GetEntry(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetEntry(), pCreature->GetGUID()); return true; } @@ -483,14 +483,14 @@ void npc_secondTrialAI::Activate(uint64 summonerguid) { summonerGuid = summonerguid; } -CreatureAI* GetAI_master_kelerun_bloodmourn(Creature *_Creature) +CreatureAI* GetAI_master_kelerun_bloodmourn(Creature* pCreature) { - return new master_kelerun_bloodmournAI (_Creature); + return new master_kelerun_bloodmournAI (pCreature); } -CreatureAI* GetAI_npc_secondTrial(Creature *_Creature) +CreatureAI* GetAI_npc_secondTrial(Creature* pCreature) { - return new npc_secondTrialAI (_Creature); + return new npc_secondTrialAI (pCreature); } /*###### @@ -587,9 +587,9 @@ bool QuestAccept_npc_apprentice_mirveda(Player* pPlayer, Creature* creature, Que return true; } -CreatureAI* GetAI_npc_apprentice_mirvedaAI(Creature *_Creature) +CreatureAI* GetAI_npc_apprentice_mirvedaAI(Creature* pCreature) { - return new npc_apprentice_mirvedaAI (_Creature); + return new npc_apprentice_mirvedaAI (pCreature); } /*###### @@ -694,9 +694,9 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_npc_infused_crystalAI(Creature *_Creature) +CreatureAI* GetAI_npc_infused_crystalAI(Creature* pCreature) { - return new npc_infused_crystalAI (_Creature); + return new npc_infused_crystalAI (pCreature); } void AddSC_eversong_woods() diff --git a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp index 1382fcf67c1..ed7ae74957e 100644 --- a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp +++ b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp @@ -33,23 +33,23 @@ EndContentData */ #define GOSSIP_ITEM_BEACON "Please make me a Cenarion Beacon" -bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature *_Creature) +bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCreature) { - uint32 eCreature = _Creature->GetEntry(); + uint32 eCreature = pCreature->GetEntry(); - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (eCreature==9528) { if (pPlayer->GetQuestRewardStatus(4101)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(2848, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2848, pCreature->GetGUID()); }else if (pPlayer->GetTeam()==HORDE) - pPlayer->SEND_GOSSIP_MENU(2845, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2845, pCreature->GetGUID()); else - pPlayer->SEND_GOSSIP_MENU(2844, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2844, pCreature->GetGUID()); } if (eCreature==9529) @@ -57,22 +57,22 @@ bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature *_Crea if (pPlayer->GetQuestRewardStatus(4102)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(2849, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2849, pCreature->GetGUID()); }else if (pPlayer->GetTeam() == ALLIANCE) - pPlayer->SEND_GOSSIP_MENU(2843, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2843, pCreature->GetGUID()); else - pPlayer->SEND_GOSSIP_MENU(2842, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2842, pCreature->GetGUID()); } return true; } -bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action==GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer, 15120, false); + pCreature->CastSpell(pPlayer, 15120, false); } return true; } diff --git a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp index 2f58acafaa0..90cf4d1db4d 100644 --- a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp +++ b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp @@ -30,27 +30,27 @@ EndScriptData */ #define GOSSIP_HELLO "Buy somethin', will ya?" -bool GossipHello_npc_gregan_brewspewer(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isVendor() && pPlayer->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE) + if (pCreature->isVendor() && pPlayer->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(2433,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2433, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(2434,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2434, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -200,11 +200,11 @@ bool QuestAccept_npc_oox22fe(Player* pPlayer, Creature* pCreature, const Quest* ## npc_screecher_spirit ######*/ -bool GossipHello_npc_screecher_spirit(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_screecher_spirit(Player* pPlayer, Creature* pCreature) { - pPlayer->SEND_GOSSIP_MENU(2039, _Creature->GetGUID()); - pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); - _Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pPlayer->SEND_GOSSIP_MENU(2039, pCreature->GetGUID()); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return true; } diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index 6ed1ab8020c..8943e48e8e6 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -37,17 +37,17 @@ EndContentData */ #define GOSSIP_H_BKD "Take Blood Knight Insignia" -bool GossipHello_npc_blood_knight_dawnstar(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_blood_knight_dawnstar(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226,1,true)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { @@ -68,24 +68,24 @@ bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature *_Creature #define GOSSIP_HBN "You gave the crew disguises?" -bool GossipHello_npc_budd_nedreck(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_budd_nedreck(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer, 42540, false); + pCreature->CastSpell(pPlayer, 42540, false); } return true; } @@ -94,25 +94,25 @@ bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature *_Creature, uint32 ## npc_rathis_tomber ######*/ -bool GossipHello_npc_rathis_tomber(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_rathis_tomber(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(9152)) + if (pCreature->isVendor() && pPlayer->GetQuestRewardStatus(9152)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(8432, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8432, pCreature->GetGUID()); }else - pPlayer->SEND_GOSSIP_MENU(8431,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8431, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -251,9 +251,9 @@ bool QuestAccept_npc_ranger_lilatha(Player* pPlayer, Creature* creature, Quest c return true; } -CreatureAI* GetAI_npc_ranger_lilathaAI(Creature *_Creature) +CreatureAI* GetAI_npc_ranger_lilathaAI(Creature* pCreature) { - npc_ranger_lilathaAI* ranger_lilathaAI = new npc_ranger_lilathaAI(_Creature); + npc_ranger_lilathaAI* ranger_lilathaAI = new npc_ranger_lilathaAI(pCreature); ranger_lilathaAI->FillPointMovementListForCreature(); diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp index 90df77ac82e..dc4d9df18c4 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp @@ -244,9 +244,9 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_gruul(Creature *_Creature) +CreatureAI* GetAI_boss_gruul(Creature* pCreature) { - return new boss_gruulAI (_Creature); + return new boss_gruulAI (pCreature); } void AddSC_boss_gruul() diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp index 0de7c624407..6918feaabba 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp @@ -736,29 +736,29 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_high_king_maulgar(Creature *_Creature) +CreatureAI* GetAI_boss_high_king_maulgar(Creature* pCreature) { - return new boss_high_king_maulgarAI (_Creature); + return new boss_high_king_maulgarAI (pCreature); } -CreatureAI* GetAI_boss_olm_the_summoner(Creature *_Creature) +CreatureAI* GetAI_boss_olm_the_summoner(Creature* pCreature) { - return new boss_olm_the_summonerAI (_Creature); + return new boss_olm_the_summonerAI (pCreature); } -CreatureAI *GetAI_boss_kiggler_the_crazed(Creature *_Creature) +CreatureAI *GetAI_boss_kiggler_the_crazed(Creature* pCreature) { - return new boss_kiggler_the_crazedAI (_Creature); + return new boss_kiggler_the_crazedAI (pCreature); } -CreatureAI *GetAI_boss_blindeye_the_seer(Creature *_Creature) +CreatureAI *GetAI_boss_blindeye_the_seer(Creature* pCreature) { - return new boss_blindeye_the_seerAI (_Creature); + return new boss_blindeye_the_seerAI (pCreature); } -CreatureAI *GetAI_boss_krosh_firehand(Creature *_Creature) +CreatureAI *GetAI_boss_krosh_firehand(Creature* pCreature) { - return new boss_krosh_firehandAI (_Creature); + return new boss_krosh_firehandAI (pCreature); } void AddSC_boss_high_king_maulgar() diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp index e18bfa63b7c..4d18ad6ba7c 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp @@ -39,9 +39,9 @@ struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI void JustDied(Unit* killer) {} }; -CreatureAI* GetAI_boss_drakkari_colossus(Creature *_Creature) +CreatureAI* GetAI_boss_drakkari_colossus(Creature* pCreature) { - return new boss_drakkari_colossusAI (_Creature); + return new boss_drakkari_colossusAI (pCreature); } void AddSC_boss_drakkari_colossus() diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp index ae0376649b0..8c72de6c9ad 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp @@ -49,9 +49,9 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI void JustDied(Unit* killer) {} }; -CreatureAI* GetAI_boss_eck(Creature *_Creature) +CreatureAI* GetAI_boss_eck(Creature* pCreature) { - return new boss_eckAI (_Creature); + return new boss_eckAI (pCreature); } void AddSC_boss_eck() diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp index 5256fcc8730..65edd1b312e 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp @@ -69,9 +69,9 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_gal_darah(Creature *_Creature) +CreatureAI* GetAI_boss_gal_darah(Creature* pCreature) { - return new boss_gal_darahAI (_Creature); + return new boss_gal_darahAI (pCreature); } void AddSC_boss_gal_darah() diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp index 0e1df4b35d0..7bdbe0eebc9 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp @@ -72,9 +72,9 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_moorabi(Creature *_Creature) +CreatureAI* GetAI_boss_moorabi(Creature* pCreature) { - return new boss_moorabiAI (_Creature); + return new boss_moorabiAI (pCreature); } void AddSC_boss_moorabi() diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp index 592a1959cd0..559a0090e3b 100644 --- a/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp +++ b/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp @@ -79,9 +79,9 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_slad_ran(Creature *_Creature) +CreatureAI* GetAI_boss_slad_ran(Creature* pCreature) { - return new boss_slad_ranAI (_Creature); + return new boss_slad_ranAI (pCreature); } void AddSC_boss_slad_ran() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp index beda1f0f2fe..6c877602426 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp @@ -116,9 +116,9 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI }; -CreatureAI* GetAI_boss_broggok(Creature *_Creature) +CreatureAI* GetAI_boss_broggok(Creature* pCreature) { - return new boss_broggokAI (_Creature); + return new boss_broggokAI (pCreature); } void AddSC_boss_broggok() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 878fa6f61ee..097a1f21a0d 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -264,9 +264,9 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI }; -CreatureAI* GetAI_boss_kelidan_the_breaker(Creature *_Creature) +CreatureAI* GetAI_boss_kelidan_the_breaker(Creature* pCreature) { - return new boss_kelidan_the_breakerAI (_Creature); + return new boss_kelidan_the_breakerAI (pCreature); } /*###### @@ -356,9 +356,9 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_shadowmoon_channeler(Creature *_Creature) +CreatureAI* GetAI_mob_shadowmoon_channeler(Creature* pCreature) { - return new mob_shadowmoon_channelerAI (_Creature); + return new mob_shadowmoon_channelerAI (pCreature); } void AddSC_boss_kelidan_the_breaker() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp index 0a23f275c35..9902c505b6b 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp @@ -146,9 +146,9 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_the_makerAI(Creature *_Creature) +CreatureAI* GetAI_boss_the_makerAI(Creature* pCreature) { - return new boss_the_makerAI (_Creature); + return new boss_the_makerAI (pCreature); } void AddSC_boss_the_maker() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index 0dbc172c767..e7411187e86 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -197,9 +197,9 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_omor_the_unscarredAI(Creature *_Creature) +CreatureAI* GetAI_boss_omor_the_unscarredAI(Creature* pCreature) { - return new boss_omor_the_unscarredAI (_Creature); + return new boss_omor_the_unscarredAI (pCreature); } void AddSC_boss_omor_the_unscarred() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index abd06dcccba..98aa4627be2 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -443,25 +443,25 @@ struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_vazruden_the_herald(Creature *_Creature) +CreatureAI* GetAI_boss_vazruden_the_herald(Creature* pCreature) { - return new boss_vazruden_the_heraldAI (_Creature); + return new boss_vazruden_the_heraldAI (pCreature); } -CreatureAI* GetAI_boss_vazruden(Creature *_Creature) +CreatureAI* GetAI_boss_vazruden(Creature* pCreature) { - return new boss_vazrudenAI (_Creature); + return new boss_vazrudenAI (pCreature); } -CreatureAI* GetAI_boss_nazan(Creature *_Creature) +CreatureAI* GetAI_boss_nazan(Creature* pCreature) { - return new boss_nazanAI (_Creature); + return new boss_nazanAI (pCreature); } -CreatureAI* GetAI_mob_hellfire_sentry(Creature *_Creature) +CreatureAI* GetAI_mob_hellfire_sentry(Creature* pCreature) { - return new mob_hellfire_sentryAI (_Creature); + return new mob_hellfire_sentryAI (pCreature); } void AddSC_boss_vazruden_the_herald() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index 9a2d6ce1b85..13059c55ff2 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -152,9 +152,9 @@ struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_watchkeeper_gargolmarAI(Creature *_Creature) +CreatureAI* GetAI_boss_watchkeeper_gargolmarAI(Creature* pCreature) { - return new boss_watchkeeper_gargolmarAI (_Creature); + return new boss_watchkeeper_gargolmarAI (pCreature); } void AddSC_boss_watchkeeper_gargolmar() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index d412da15d0b..2ac2999e315 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -520,19 +520,19 @@ bool GOHello_go_Manticron_Cube(Player* pPlayer, GameObject* _GO) return true; } -CreatureAI* GetAI_boss_magtheridon(Creature *_Creature) +CreatureAI* GetAI_boss_magtheridon(Creature* pCreature) { - return new boss_magtheridonAI(_Creature); + return new boss_magtheridonAI(pCreature); } -CreatureAI* GetAI_mob_hellfire_channeler(Creature *_Creature) +CreatureAI* GetAI_mob_hellfire_channeler(Creature* pCreature) { - return new mob_hellfire_channelerAI(_Creature); + return new mob_hellfire_channelerAI(pCreature); } -CreatureAI* GetAI_mob_abyssalAI(Creature *_Creature) +CreatureAI* GetAI_mob_abyssalAI(Creature* pCreature) { - return new mob_abyssalAI(_Creature); + return new mob_abyssalAI(pCreature); } void AddSC_boss_magtheridon() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index fb6d9a6fa47..acf90450a0d 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -375,19 +375,19 @@ struct TRINITY_DLL_DECL mob_lesser_shadow_fissureAI : public ScriptedAI void EnterCombat(Unit* who) { } }; -CreatureAI* GetAI_boss_grand_warlock_nethekurse(Creature *_Creature) +CreatureAI* GetAI_boss_grand_warlock_nethekurse(Creature* pCreature) { - return new boss_grand_warlock_nethekurseAI (_Creature); + return new boss_grand_warlock_nethekurseAI (pCreature); } -CreatureAI* GetAI_mob_fel_orc_convert(Creature *_Creature) +CreatureAI* GetAI_mob_fel_orc_convert(Creature* pCreature) { - return new mob_fel_orc_convertAI (_Creature); + return new mob_fel_orc_convertAI (pCreature); } -CreatureAI* GetAI_mob_lesser_shadow_fissure(Creature *_Creature) +CreatureAI* GetAI_mob_lesser_shadow_fissure(Creature* pCreature) { - return new mob_lesser_shadow_fissureAI (_Creature); + return new mob_lesser_shadow_fissureAI (pCreature); } void AddSC_boss_grand_warlock_nethekurse() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index f08c822a19f..0681e94e2b0 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -381,14 +381,14 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_warbringer_omrogg(Creature *_Creature) +CreatureAI* GetAI_boss_warbringer_omrogg(Creature* pCreature) { - return new boss_warbringer_omroggAI (_Creature); + return new boss_warbringer_omroggAI (pCreature); } -CreatureAI* GetAI_mob_omrogg_heads(Creature *_Creature) +CreatureAI* GetAI_mob_omrogg_heads(Creature* pCreature) { - return new mob_omrogg_headsAI (_Creature); + return new mob_omrogg_headsAI (pCreature); } void AddSC_boss_warbringer_omrogg() diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index 6f0f21b8894..4fa673f3560 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -287,9 +287,9 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_warchief_kargath_bladefist(Creature *_Creature) +CreatureAI* GetAI_boss_warchief_kargath_bladefist(Creature* pCreature) { - return new boss_warchief_kargath_bladefistAI (_Creature); + return new boss_warchief_kargath_bladefistAI (pCreature); } void AddSC_boss_warchief_kargath_bladefist() diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp index 2ab8643847e..054f1d41ee0 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp @@ -167,9 +167,9 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI }; -CreatureAI* GetAI_boss_doomlordkazzak(Creature *_Creature) +CreatureAI* GetAI_boss_doomlordkazzak(Creature* pCreature) { - return new boss_doomlordkazzakAI (_Creature); + return new boss_doomlordkazzakAI (pCreature); } void AddSC_boss_doomlordkazzak() diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp index 7eaa306b030..8ad353b03d2 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp @@ -111,9 +111,9 @@ struct TRINITY_DLL_DECL npc_aeranasAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_aeranas(Creature *_Creature) +CreatureAI* GetAI_npc_aeranas(Creature* pCreature) { - return new npc_aeranasAI (_Creature); + return new npc_aeranasAI (pCreature); } /*###### diff --git a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp index 1f1c5953e10..550db276d7d 100644 --- a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp +++ b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp @@ -37,41 +37,41 @@ EndContentData */ #define GOSSIP_ITEM_ROYAL_3 "Unbelievable! How dare they??" #define GOSSIP_ITEM_ROYAL_4 "Of course I will help!" -bool GossipHello_npc_royal_historian_archesonus(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_royal_historian_archesonus(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(3702) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(2235, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2235, pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_royal_historian_archesonus(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_royal_historian_archesonus(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2236, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2236, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(2237, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2237, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(2238, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2238, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(2239, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2239, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp index 68c937490a0..469e2f712f1 100644 --- a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp +++ b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp @@ -75,9 +75,9 @@ struct TRINITY_DLL_DECL npc_converted_sentryAI : public ScriptedAI } } }; -CreatureAI* GetAI_npc_converted_sentry(Creature *_Creature) +CreatureAI* GetAI_npc_converted_sentry(Creature* pCreature) { - return new npc_converted_sentryAI (_Creature); + return new npc_converted_sentryAI (pCreature); } /*###### @@ -132,9 +132,9 @@ struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_greengill_slaveAI(Creature* _Creature) +CreatureAI* GetAI_npc_greengill_slaveAI(Creature* pCreature) { - return new npc_greengill_slaveAI(_Creature); + return new npc_greengill_slaveAI(pCreature); } void AddSC_isle_of_queldanas() diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp index 539dfefaacc..218a1dafc39 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp @@ -186,9 +186,9 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_curator(Creature *_Creature) +CreatureAI* GetAI_boss_curator(Creature* pCreature) { - return new boss_curatorAI (_Creature); + return new boss_curatorAI (pCreature); } void AddSC_boss_curator() diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp index 50bc037d6fb..508e718797d 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp @@ -134,9 +134,9 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI }; -CreatureAI* GetAI_boss_maiden_of_virtue(Creature *_Creature) +CreatureAI* GetAI_boss_maiden_of_virtue(Creature* pCreature) { - return new boss_maiden_of_virtueAI (_Creature); + return new boss_maiden_of_virtueAI (pCreature); } void AddSC_boss_maiden_of_virtue() diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp index 2bbe70e3373..2684f5cce20 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp @@ -155,9 +155,9 @@ struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI void SetMidnight(Creature *, uint64); //Below .. }; -CreatureAI* GetAI_boss_midnight(Creature *_Creature) +CreatureAI* GetAI_boss_midnight(Creature* pCreature) { - return new boss_midnightAI(_Creature); + return new boss_midnightAI(pCreature); } struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI @@ -302,9 +302,9 @@ void boss_midnightAI::SetMidnight(Creature *pAttumen, uint64 value) CAST_AI(boss_attumenAI, pAttumen->AI())->Midnight = value; } -CreatureAI* GetAI_boss_attumen(Creature *_Creature) +CreatureAI* GetAI_boss_attumen(Creature* pCreature) { - return new boss_attumenAI (_Creature); + return new boss_attumenAI (pCreature); } void AddSC_boss_attumen() diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp index 27e5ed62d6f..6d871ef04b7 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp @@ -742,39 +742,39 @@ struct TRINITY_DLL_DECL boss_lord_crispin_ferenceAI : public boss_moroes_guestAI } }; -CreatureAI* GetAI_boss_moroes(Creature *_Creature) +CreatureAI* GetAI_boss_moroes(Creature* pCreature) { - return new boss_moroesAI (_Creature); + return new boss_moroesAI (pCreature); } -CreatureAI* GetAI_baroness_dorothea_millstipe(Creature *_Creature) +CreatureAI* GetAI_baroness_dorothea_millstipe(Creature* pCreature) { - return new boss_baroness_dorothea_millstipeAI (_Creature); + return new boss_baroness_dorothea_millstipeAI (pCreature); } -CreatureAI* GetAI_baron_rafe_dreuger(Creature *_Creature) +CreatureAI* GetAI_baron_rafe_dreuger(Creature* pCreature) { - return new boss_baron_rafe_dreugerAI (_Creature); + return new boss_baron_rafe_dreugerAI (pCreature); } -CreatureAI* GetAI_lady_catriona_von_indi(Creature *_Creature) +CreatureAI* GetAI_lady_catriona_von_indi(Creature* pCreature) { - return new boss_lady_catriona_von_indiAI (_Creature); + return new boss_lady_catriona_von_indiAI (pCreature); } -CreatureAI* GetAI_lady_keira_berrybuck(Creature *_Creature) +CreatureAI* GetAI_lady_keira_berrybuck(Creature* pCreature) { - return new boss_lady_keira_berrybuckAI (_Creature); + return new boss_lady_keira_berrybuckAI (pCreature); } -CreatureAI* GetAI_lord_robin_daris(Creature *_Creature) +CreatureAI* GetAI_lord_robin_daris(Creature* pCreature) { - return new boss_lord_robin_darisAI (_Creature); + return new boss_lord_robin_darisAI (pCreature); } -CreatureAI* GetAI_lord_crispin_ference(Creature *_Creature) +CreatureAI* GetAI_lord_crispin_ference(Creature* pCreature) { - return new boss_lord_crispin_ferenceAI (_Creature); + return new boss_lord_crispin_ferenceAI (pCreature); } void AddSC_boss_moroes() diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp index 65ab2cfbec1..e417ead7cae 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp @@ -405,9 +405,9 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_nightbane(Creature *_Creature) +CreatureAI* GetAI_boss_nightbane(Creature* pCreature) { - return new boss_nightbaneAI (_Creature); + return new boss_nightbaneAI (pCreature); } void AddSC_boss_nightbane() diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp index 2baf4b1fb20..ba797dc13c2 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp @@ -606,14 +606,14 @@ void netherspite_infernalAI::Cleanup() CAST_AI(boss_malchezaarAI, CAST_CRE(pMalchezaar)->AI())->Cleanup(m_creature, point); } -CreatureAI* GetAI_netherspite_infernal(Creature *_Creature) +CreatureAI* GetAI_netherspite_infernal(Creature* pCreature) { - return new netherspite_infernalAI (_Creature); + return new netherspite_infernalAI (pCreature); } -CreatureAI* GetAI_boss_malchezaar(Creature *_Creature) +CreatureAI* GetAI_boss_malchezaar(Creature* pCreature) { - return new boss_malchezaarAI (_Creature); + return new boss_malchezaarAI (pCreature); } void AddSC_boss_malchezaar() diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp index 9abf3464456..b76156b5fad 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp @@ -543,21 +543,21 @@ struct TRINITY_DLL_DECL water_elementalAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_aran(Creature *_Creature) +CreatureAI* GetAI_boss_aran(Creature* pCreature) { - return new boss_aranAI (_Creature); + return new boss_aranAI (pCreature); } -CreatureAI* GetAI_water_elemental(Creature *_Creature) +CreatureAI* GetAI_water_elemental(Creature* pCreature) { - return new water_elementalAI (_Creature); + return new water_elementalAI (pCreature); } // CONVERT TO ACID -CreatureAI* GetAI_shadow_of_aran(Creature *_Creature) +CreatureAI* GetAI_shadow_of_aran(Creature* pCreature) { - outstring_log("TSCR: Convert simpleAI script for Creature Entry %u to ACID", _Creature->GetEntry()); - SimpleAI* ai = new SimpleAI (_Creature); + outstring_log("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry()); + SimpleAI* ai = new SimpleAI (pCreature); ai->Spell[0].Enabled = true; ai->Spell[0].Spell_Id = SPELL_SHADOW_PYRO; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp index dbb8079468d..c824f344942 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp @@ -386,24 +386,24 @@ struct TRINITY_DLL_DECL mob_fiendish_impAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_kilrek(Creature *_Creature) +CreatureAI* GetAI_mob_kilrek(Creature* pCreature) { - return new mob_kilrekAI (_Creature); + return new mob_kilrekAI (pCreature); } -CreatureAI* GetAI_mob_fiendish_imp(Creature *_Creature) +CreatureAI* GetAI_mob_fiendish_imp(Creature* pCreature) { - return new mob_fiendish_impAI (_Creature); + return new mob_fiendish_impAI (pCreature); } -CreatureAI* GetAI_mob_demon_chain(Creature *_Creature) +CreatureAI* GetAI_mob_demon_chain(Creature* pCreature) { - return new mob_demon_chainAI(_Creature); + return new mob_demon_chainAI(pCreature); } -CreatureAI* GetAI_boss_terestian_illhoof(Creature *_Creature) +CreatureAI* GetAI_boss_terestian_illhoof(Creature* pCreature) { - return new boss_terestianAI (_Creature); + return new boss_terestianAI (pCreature); } void AddSC_boss_terestian_illhoof() diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp index f6d3fd0f4df..fde2b83b84d 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp @@ -664,39 +664,39 @@ struct TRINITY_DLL_DECL mob_cycloneAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_dorothee(Creature* _Creature) +CreatureAI* GetAI_boss_dorothee(Creature* pCreature) { - return new boss_dorotheeAI(_Creature); + return new boss_dorotheeAI(pCreature); } -CreatureAI* GetAI_boss_strawman(Creature* _Creature) +CreatureAI* GetAI_boss_strawman(Creature* pCreature) { - return new boss_strawmanAI(_Creature); + return new boss_strawmanAI(pCreature); } -CreatureAI* GetAI_boss_tinhead(Creature* _Creature) +CreatureAI* GetAI_boss_tinhead(Creature* pCreature) { - return new boss_tinheadAI(_Creature); + return new boss_tinheadAI(pCreature); } -CreatureAI* GetAI_boss_roar(Creature* _Creature) +CreatureAI* GetAI_boss_roar(Creature* pCreature) { - return new boss_roarAI(_Creature); + return new boss_roarAI(pCreature); } -CreatureAI* GetAI_boss_crone(Creature* _Creature) +CreatureAI* GetAI_boss_crone(Creature* pCreature) { - return new boss_croneAI(_Creature); + return new boss_croneAI(pCreature); } -CreatureAI* GetAI_mob_tito(Creature* _Creature) +CreatureAI* GetAI_mob_tito(Creature* pCreature) { - return new mob_titoAI(_Creature); + return new mob_titoAI(pCreature); } -CreatureAI* GetAI_mob_cyclone(Creature* _Creature) +CreatureAI* GetAI_mob_cyclone(Creature* pCreature) { - return new mob_cycloneAI(_Creature); + return new mob_cycloneAI(pCreature); } /**************************************/ @@ -719,10 +719,10 @@ CreatureAI* GetAI_mob_cyclone(Creature* _Creature) /**** The Wolf's Entry ****/ #define CREATURE_BIG_BAD_WOLF 17521 -bool GossipHello_npc_grandmother(Player* pPlayer, Creature* _Creature) +bool GossipHello_npc_grandmother(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(8990, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8990, pCreature->GetGUID()); return true; } @@ -856,9 +856,9 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_bigbadwolf(Creature* _Creature) +CreatureAI* GetAI_boss_bigbadwolf(Creature* pCreature) { - return new boss_bigbadwolfAI(_Creature); + return new boss_bigbadwolfAI(pCreature); } /**********************************************/ @@ -908,15 +908,15 @@ enum RAJPhase PHASE_BOTH = 2, }; -void PretendToDie(Creature* _Creature) +void PretendToDie(Creature* pCreature) { - _Creature->InterruptNonMeleeSpells(true); - _Creature->RemoveAllAuras(); - _Creature->SetHealth(0); - _Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - _Creature->GetMotionMaster()->MovementExpired(false); - _Creature->GetMotionMaster()->MoveIdle(); - _Creature->SetStandState(UNIT_STAND_STATE_DEAD); + pCreature->InterruptNonMeleeSpells(true); + pCreature->RemoveAllAuras(); + pCreature->SetHealth(0); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pCreature->GetMotionMaster()->MovementExpired(false); + pCreature->GetMotionMaster()->MoveIdle(); + pCreature->SetStandState(UNIT_STAND_STATE_DEAD); }; void Resurrect(Creature* target) @@ -1424,14 +1424,14 @@ void boss_romuloAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } -CreatureAI* GetAI_boss_julianne(Creature* _Creature) +CreatureAI* GetAI_boss_julianne(Creature* pCreature) { - return new boss_julianneAI(_Creature); + return new boss_julianneAI(pCreature); } -CreatureAI* GetAI_boss_romulo(Creature* _Creature) +CreatureAI* GetAI_boss_romulo(Creature* pCreature) { - return new boss_romuloAI(_Creature); + return new boss_romuloAI(pCreature); } void AddSC_bosses_opera() diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp index 0fc5d6b82df..a859516e8dc 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp @@ -318,9 +318,9 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI } }; -CreatureAI* GetAI_npc_barnesAI(Creature* _Creature) +CreatureAI* GetAI_npc_barnesAI(Creature* pCreature) { - npc_barnesAI* Barnes_AI = new npc_barnesAI(_Creature); + npc_barnesAI* Barnes_AI = new npc_barnesAI(pCreature); Barnes_AI->FillPointMovementListForCreature(); @@ -359,15 +359,15 @@ bool GossipHello_npc_barnes(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_barnes(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { - npc_barnesAI* pBarnesAI = CAST_AI(npc_barnesAI,_Creature->AI()); + npc_barnesAI* pBarnesAI = CAST_AI(npc_barnesAI, pCreature->AI()); switch(action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(8971, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(8971, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); @@ -417,7 +417,7 @@ bool GossipHello_npc_berthold(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_berthold(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_berthold(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, true); @@ -625,9 +625,9 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_image_of_medivh(Creature *_Creature) +CreatureAI* GetAI_npc_image_of_medivh(Creature* pCreature) { - return new npc_image_of_medivhAI(_Creature); + return new npc_image_of_medivhAI(pCreature); } void AddSC_karazhan() diff --git a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp index 911b10bd6fa..bf2d013bc8d 100644 --- a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp +++ b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp @@ -40,46 +40,46 @@ EndContentData */ #define GOSSIP_MP5 "Ok, i'll try to remember that." #define GOSSIP_MP6 "A key? Ok!" -bool GossipHello_npc_mountaineer_pebblebitty(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_mountaineer_pebblebitty(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (!pPlayer->GetQuestRewardStatus(3181) == 1) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_mountaineer_pebblebitty(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_mountaineer_pebblebitty(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1833, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1833, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(1834, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1834, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(1835, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1835, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(1836, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1836, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(1837, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1837, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(1838, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1838, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp index dc64e354519..f2bb352ac60 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp @@ -1277,9 +1277,9 @@ CreatureAI* GetAI_zelfan(Creature* pCreature) // } //}; -//CreatureAI* GetAI_mob_high_explosive_sheep(Creature *_Creature) +//CreatureAI* GetAI_mob_high_explosive_sheep(Creature* pCreature) //{ -// return new mob_high_explosive_sheepAI (_Creature); +// return new mob_high_explosive_sheepAI (pCreature); //}; void AddSC_boss_priestess_delrissa() diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp index 17cd4a2ad5c..3f152593948 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp @@ -309,9 +309,9 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_selin_fireheart(Creature *_Creature) +CreatureAI* GetAI_boss_selin_fireheart(Creature* pCreature) { - return new boss_selin_fireheartAI (_Creature); + return new boss_selin_fireheartAI (pCreature); }; struct TRINITY_DLL_DECL mob_fel_crystalAI : public ScriptedAI @@ -348,9 +348,9 @@ struct TRINITY_DLL_DECL mob_fel_crystalAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_fel_crystal(Creature *_Creature) +CreatureAI* GetAI_mob_fel_crystal(Creature* pCreature) { - return new mob_fel_crystalAI (_Creature); + return new mob_fel_crystalAI (pCreature); }; void AddSC_boss_selin_fireheart() diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp index e4c9e6e0377..642d49f68ae 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp @@ -182,9 +182,9 @@ struct TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_vexallus(Creature *_Creature) +CreatureAI* GetAI_boss_vexallus(Creature* pCreature) { - return new boss_vexallusAI (_Creature); + return new boss_vexallusAI (pCreature); }; struct TRINITY_DLL_DECL mob_pure_energyAI : public ScriptedAI @@ -207,9 +207,9 @@ struct TRINITY_DLL_DECL mob_pure_energyAI : public ScriptedAI void AttackStart(Unit *who) { } }; -CreatureAI* GetAI_mob_pure_energy(Creature *_Creature) +CreatureAI* GetAI_mob_pure_energy(Creature* pCreature) { - return new mob_pure_energyAI (_Creature); + return new mob_pure_energyAI (pCreature); }; void AddSC_boss_vexallus() diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp index 5f4b79453d3..f2ac8ff08e1 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp @@ -82,9 +82,9 @@ struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_celebras_the_cursed(Creature *_Creature) +CreatureAI* GetAI_celebras_the_cursed(Creature* pCreature) { - return new celebras_the_cursedAI (_Creature); + return new celebras_the_cursedAI (pCreature); } void AddSC_boss_celebras_the_cursed() diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp index 4623a274767..353b9c1e3c0 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp @@ -79,9 +79,9 @@ struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_landslide(Creature *_Creature) +CreatureAI* GetAI_boss_landslide(Creature* pCreature) { - return new boss_landslideAI (_Creature); + return new boss_landslideAI (pCreature); } void AddSC_boss_landslide() diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp index 2064287b05e..62190d4192a 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp @@ -134,9 +134,9 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_noxxion(Creature *_Creature) +CreatureAI* GetAI_boss_noxxion(Creature* pCreature) { - return new boss_noxxionAI (_Creature); + return new boss_noxxionAI (pCreature); } void AddSC_boss_noxxion() diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp index 8da0f24ba53..7199c18cf75 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp @@ -93,9 +93,9 @@ struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_ptheradras(Creature *_Creature) +CreatureAI* GetAI_boss_ptheradras(Creature* pCreature) { - return new boss_ptheradrasAI (_Creature); + return new boss_ptheradrasAI (pCreature); } void AddSC_boss_ptheradras() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp index 26361c68e2b..bd8fd74a66a 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp @@ -91,9 +91,9 @@ struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_baron_geddon(Creature *_Creature) +CreatureAI* GetAI_boss_baron_geddon(Creature* pCreature) { - return new boss_baron_geddonAI (_Creature); + return new boss_baron_geddonAI (pCreature); } void AddSC_boss_baron_geddon() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp index 3dcb017cf73..0dbfab63044 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp @@ -116,14 +116,14 @@ struct TRINITY_DLL_DECL mob_fireswornAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_garr(Creature *_Creature) +CreatureAI* GetAI_boss_garr(Creature* pCreature) { - return new boss_garrAI (_Creature); + return new boss_garrAI (pCreature); } -CreatureAI* GetAI_mob_firesworn(Creature *_Creature) +CreatureAI* GetAI_mob_firesworn(Creature* pCreature) { - return new mob_fireswornAI (_Creature); + return new mob_fireswornAI (pCreature); } void AddSC_boss_garr() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp index 377ee2c6453..9b965b38375 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp @@ -76,9 +76,9 @@ struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_gehennas(Creature *_Creature) +CreatureAI* GetAI_boss_gehennas(Creature* pCreature) { - return new boss_gehennasAI (_Creature); + return new boss_gehennasAI (pCreature); } void AddSC_boss_gehennas() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp index 66b7f44f2e1..c9dc16b67d6 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp @@ -172,14 +172,14 @@ struct TRINITY_DLL_DECL mob_core_ragerAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_golemagg(Creature *_Creature) +CreatureAI* GetAI_boss_golemagg(Creature* pCreature) { - return new boss_golemaggAI (_Creature); + return new boss_golemaggAI (pCreature); } -CreatureAI* GetAI_mob_core_rager(Creature *_Creature) +CreatureAI* GetAI_mob_core_rager(Creature* pCreature) { - return new mob_core_ragerAI (_Creature); + return new mob_core_ragerAI (pCreature); } void AddSC_boss_golemagg() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp index 4514f4640dd..0b902d30be5 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp @@ -75,9 +75,9 @@ struct TRINITY_DLL_DECL boss_lucifronAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_lucifron(Creature *_Creature) +CreatureAI* GetAI_boss_lucifron(Creature* pCreature) { - return new boss_lucifronAI (_Creature); + return new boss_lucifronAI (pCreature); } void AddSC_boss_lucifron() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp index 08bc9916676..4e7e8497d9a 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp @@ -84,9 +84,9 @@ struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_magmadar(Creature *_Creature) +CreatureAI* GetAI_boss_magmadar(Creature* pCreature) { - return new boss_magmadarAI (_Creature); + return new boss_magmadarAI (pCreature); } void AddSC_boss_magmadar() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp index b9112cf2350..a62afe260a6 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp @@ -123,9 +123,9 @@ struct TRINITY_DLL_DECL boss_majordomoAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_majordomo(Creature *_Creature) +CreatureAI* GetAI_boss_majordomo(Creature* pCreature) { - return new boss_majordomoAI (_Creature); + return new boss_majordomoAI (pCreature); } void AddSC_boss_majordomo() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp index aba509ff151..d665362e3b6 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp @@ -285,9 +285,9 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI } } }; -CreatureAI* GetAI_boss_ragnaros(Creature *_Creature) +CreatureAI* GetAI_boss_ragnaros(Creature* pCreature) { - return new boss_ragnarosAI (_Creature); + return new boss_ragnarosAI (pCreature); } void AddSC_boss_ragnaros() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp index de32ba28c7f..928cbf70fc3 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp @@ -108,9 +108,9 @@ struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_shazzrah(Creature *_Creature) +CreatureAI* GetAI_boss_shazzrah(Creature* pCreature) { - return new boss_shazzrahAI (_Creature); + return new boss_shazzrahAI (pCreature); } void AddSC_boss_shazzrah() diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp index d86ed5165b5..56cf7fe31e3 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp @@ -187,14 +187,14 @@ struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_sulfuron(Creature *_Creature) +CreatureAI* GetAI_boss_sulfuron(Creature* pCreature) { - return new boss_sulfuronAI (_Creature); + return new boss_sulfuronAI (pCreature); } -CreatureAI* GetAI_mob_flamewaker_priest(Creature *_Creature) +CreatureAI* GetAI_mob_flamewaker_priest(Creature* pCreature) { - return new mob_flamewaker_priestAI (_Creature); + return new mob_flamewaker_priestAI (pCreature); } void AddSC_boss_sulfuron() diff --git a/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp b/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp index 33d213b22fa..945631665ec 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp @@ -39,9 +39,9 @@ EndContentData */ #define SPELL_ANCIENT_DESPAIR 19369 #define SPELL_ANCIENT_HYSTERIA 19372 -CreatureAI* GetAI_mob_ancient_core_hound(Creature *_Creature) +CreatureAI* GetAI_mob_ancient_core_hound(Creature* pCreature) { - SimpleAI *ai = new SimpleAI(_Creature); + SimpleAI *ai = new SimpleAI(pCreature); ai->Spell[0].Enabled = true; ai->Spell[0].Spell_Id = SPELL_CONE_OF_FIRE; diff --git a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp index f4c9d4f6737..82fa0ad1531 100644 --- a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp +++ b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp @@ -47,16 +47,16 @@ enum #define GOSSIP_ITEM_THUNDER "I'd like to fly to Thunder Bluff." #define GOSSIP_ITEM_AQ_END "Do you know where I can find Half Pendant of Aquatic Endurance?" -bool GossipHello_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_bunthen_plainswind(Player* pPlayer, Creature* pCreature) { if (pPlayer->getClass() != CLASS_DRUID) - pPlayer->SEND_GOSSIP_MENU(4916,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4916, pCreature->GetGUID()); else if (pPlayer->GetTeam() != HORDE) { if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(4917,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4917, pCreature->GetGUID()); } else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE) { @@ -65,12 +65,12 @@ bool GossipHello_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature) if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(4918,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4918, pCreature->GetGUID()); } return true; } -bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(action) { @@ -80,10 +80,10 @@ bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature, u pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE); break; case GOSSIP_ACTION_INFO_DEF + 2: - pPlayer->SEND_GOSSIP_MENU(5373,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5373, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(5376,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5376, pCreature->GetGUID()); break; } return true; @@ -98,38 +98,38 @@ bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature, u #define GOSSIP_BEAR3 "I seek to understand the importance of strength of the heart." #define GOSSIP_BEAR4 "I have heard your words, Great Bear Spirit, and I understand. I now seek your blessings to fully learn the way of the Claw." -bool GossipHello_npc_great_bear_spirit(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature) { //ally or horde quest if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(4719, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4719, pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(4718, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4718, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(4721, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4721, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(4733, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4733, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(4734, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4734, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(4735, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4735, pCreature->GetGUID()); if (pPlayer->GetQuestStatus(5929)==QUEST_STATUS_INCOMPLETE) pPlayer->AreaExploredOrEventHappens(5929); if (pPlayer->GetQuestStatus(5930)==QUEST_STATUS_INCOMPLETE) @@ -146,16 +146,16 @@ bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature *_Creature, ui #define GOSSIP_ITEM_RUTHERAN "I'd like to fly to Rut'theran Village." #define GOSSIP_ITEM_AQ_AGI "Do you know where I can find Half Pendant of Aquatic Agility?" -bool GossipHello_npc_silva_filnaveth(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_silva_filnaveth(Player* pPlayer, Creature* pCreature) { if (pPlayer->getClass() != CLASS_DRUID) - pPlayer->SEND_GOSSIP_MENU(4913,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4913, pCreature->GetGUID()); else if (pPlayer->GetTeam() != ALLIANCE) { if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(4915,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4915, pCreature->GetGUID()); } else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE) { @@ -164,12 +164,12 @@ bool GossipHello_npc_silva_filnaveth(Player* pPlayer, Creature *_Creature) if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(4914,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4914, pCreature->GetGUID()); } return true; } -bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(action) { @@ -179,10 +179,10 @@ bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature *_Creature, uint pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY); break; case GOSSIP_ACTION_INFO_DEF + 2: - pPlayer->SEND_GOSSIP_MENU(5374,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5374, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(5375,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5375, pCreature->GetGUID()); break; } return true; @@ -509,9 +509,9 @@ public: } }; -CreatureAI* GetAI_npc_clintar_spirit(Creature *_Creature) +CreatureAI* GetAI_npc_clintar_spirit(Creature* pCreature) { - return new npc_clintar_spiritAI (_Creature); + return new npc_clintar_spiritAI (pCreature); } /*#### diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp index f9af9c786f8..6326ef733e0 100644 --- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp +++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp @@ -36,23 +36,23 @@ EndContentData */ #define GOSSIP_SW "Tell me a story, Skorn." -bool GossipHello_npc_skorn_whitecloud(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (!pPlayer->GetQuestRewardStatus(770)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(522,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(522, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) - pPlayer->SEND_GOSSIP_MENU(523,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(523, pCreature->GetGUID()); return true; } @@ -176,9 +176,9 @@ struct TRINITY_DLL_DECL npc_kyle_frenziedAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_kyle_frenzied(Creature *_Creature) +CreatureAI* GetAI_npc_kyle_frenzied(Creature* pCreature) { - return new npc_kyle_frenziedAI (_Creature); + return new npc_kyle_frenziedAI (pCreature); } /*##### @@ -283,9 +283,9 @@ struct TRINITY_DLL_DECL npc_plains_visionAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_plains_vision(Creature *_Creature) +CreatureAI* GetAI_npc_plains_vision(Creature* pCreature) { - return new npc_plains_visionAI (_Creature); + return new npc_plains_visionAI (pCreature); } /*##### diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp index d0f760e467b..afb6657a7f5 100644 --- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp +++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp @@ -68,9 +68,9 @@ struct TRINITY_DLL_DECL mob_shattered_rumblerAI : public ScriptedAI return; } }; -CreatureAI* GetAI_mob_shattered_rumbler(Creature *_Creature) +CreatureAI* GetAI_mob_shattered_rumbler(Creature* pCreature) { - return new mob_shattered_rumblerAI (_Creature); + return new mob_shattered_rumblerAI (pCreature); } /*###### @@ -188,40 +188,40 @@ struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_lump(Creature *_creature) +CreatureAI* GetAI_mob_lump(Creature* pCreature) { - return new mob_lumpAI(_creature); + return new mob_lumpAI(pCreature); } -bool GossipHello_mob_lump(Player* pPlayer, Creature *_Creature) +bool GossipHello_mob_lump(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9352, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9352, pCreature->GetGUID()); return true; } -bool GossipSelect_mob_lump(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_mob_lump(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9353, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9353, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9354, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9354, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(9355, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9355, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->SEND_GOSSIP_MENU(9356, _Creature->GetGUID()); - pPlayer->TalkedToCreature(18354, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9356, pCreature->GetGUID()); + pPlayer->TalkedToCreature(18354, pCreature->GetGUID()); break; } return true; @@ -252,9 +252,9 @@ struct TRINITY_DLL_DECL mob_sunspring_villagerAI : public ScriptedAI } } }; -CreatureAI* GetAI_mob_sunspring_villager(Creature *_Creature) +CreatureAI* GetAI_mob_sunspring_villager(Creature* pCreature) { - return new mob_sunspring_villagerAI (_Creature); + return new mob_sunspring_villagerAI (pCreature); } /*###### @@ -272,10 +272,10 @@ CreatureAI* GetAI_mob_sunspring_villager(Creature *_Creature) #define GOSSIP_SATS5 "Ok." #define GOSSIP_SATS6 "[PH] Story done" -bool GossipHello_npc_altruis_the_sufferer(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); //gossip before obtaining Survey the Land if (pPlayer->GetQuestStatus(9991) == QUEST_STATUS_NONE) @@ -289,38 +289,38 @@ bool GossipHello_npc_altruis_the_sufferer(Player* pPlayer, Creature *_Creature) if (pPlayer->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30); - pPlayer->SEND_GOSSIP_MENU(9419, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9419, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(9420, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9420, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(9421, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9421, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+12: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(9422, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9422, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+13: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); - pPlayer->SEND_GOSSIP_MENU(9423, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9423, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+14: - pPlayer->SEND_GOSSIP_MENU(9424, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9424, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+20: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); - pPlayer->SEND_GOSSIP_MENU(9427, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9427, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+21: pPlayer->CLOSE_GOSSIP_MENU(); @@ -329,7 +329,7 @@ bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature *_Creature, case GOSSIP_ACTION_INFO_DEF+30: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31); - pPlayer->SEND_GOSSIP_MENU(384, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(384, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+31: pPlayer->CLOSE_GOSSIP_MENU(); @@ -369,55 +369,55 @@ bool QuestAccept_npc_altruis_the_sufferer(Player* pPlayer, Creature *creature, Q #define GOSSIP_SGG11 "I will return to Azeroth at once, Greatmother." //all the textId's for the below is unknown, but i do believe the gossip item texts are proper. -bool GossipHello_npc_greatmother_geyah(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_greatmother_geyah(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); } else if (pPlayer->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: pPlayer->AreaExploredOrEventHappens(10044); @@ -426,23 +426,23 @@ bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature *_Creature, ui case GOSSIP_ACTION_INFO_DEF + 10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 14: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 15: pPlayer->AreaExploredOrEventHappens(10172); @@ -465,53 +465,53 @@ bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature *_Creature, ui #define GOSSIP_SLB6 "We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people." #define GOSSIP_SLB7 "What do I need to do?" -bool GossipHello_npc_lantresor_of_the_blade(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9361, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9361, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9362, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9362, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9363, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9363, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(9364, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9364, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(9365, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9365, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(9366, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9366, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(9367, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9367, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(9368, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9368, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: - pPlayer->SEND_GOSSIP_MENU(9369, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9369, pCreature->GetGUID()); if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE) pPlayer->AreaExploredOrEventHappens(10107); if (pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) @@ -554,9 +554,9 @@ struct TRINITY_DLL_DECL npc_creditmarker_visit_with_ancestorsAI : public Scripte } }; -CreatureAI* GetAI_npc_creditmarker_visit_with_ancestors(Creature *_Creature) +CreatureAI* GetAI_npc_creditmarker_visit_with_ancestors(Creature* pCreature) { - return new npc_creditmarker_visit_with_ancestorsAI (_Creature); + return new npc_creditmarker_visit_with_ancestorsAI (pCreature); } /*###### @@ -656,9 +656,9 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_sparrowhawk(Creature *_Creature) +CreatureAI* GetAI_mob_sparrowhawk(Creature* pCreature) { - return new mob_sparrowhawkAI (_Creature); + return new mob_sparrowhawkAI (pCreature); } /*#### diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp index 3357d88b69e..835a5bfa2da 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp @@ -107,9 +107,9 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI } }; -CreatureAI* GetAI_boss_anubrekhan(Creature *_Creature) +CreatureAI* GetAI_boss_anubrekhan(Creature* pCreature) { - return new boss_anubrekhanAI (_Creature); + return new boss_anubrekhanAI (pCreature); } void AddSC_boss_anubrekhan() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp index 9f133df6c83..4be8f839e3d 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp @@ -107,9 +107,9 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI } }; -CreatureAI* GetAI_boss_faerlina(Creature *_Creature) +CreatureAI* GetAI_boss_faerlina(Creature* pCreature) { - return new boss_faerlinaAI (_Creature); + return new boss_faerlinaAI (pCreature); } void AddSC_boss_faerlina() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp index 30196384e59..467f5ef62e9 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp @@ -152,9 +152,9 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI } }; -CreatureAI* GetAI_four_horsemen(Creature *_Creature) +CreatureAI* GetAI_four_horsemen(Creature* pCreature) { - return new boss_four_horsemenAI (_Creature); + return new boss_four_horsemenAI (pCreature); } void AddSC_boss_four_horsemen() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp index 574dfab51c1..a92c34a019c 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp @@ -144,9 +144,9 @@ struct TRINITY_DLL_DECL boss_gluthAI : public BossAI } }; -CreatureAI* GetAI_boss_gluth(Creature *_Creature) +CreatureAI* GetAI_boss_gluth(Creature* pCreature) { - return new boss_gluthAI (_Creature); + return new boss_gluthAI (pCreature); } void AddSC_boss_gluth() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp index 7b7b08c41c7..f98e7667e6e 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp @@ -322,14 +322,14 @@ struct TRINITY_DLL_DECL mob_gothik_minionAI : public SpellAI } }; -CreatureAI* GetAI_boss_gothik(Creature *_Creature) +CreatureAI* GetAI_boss_gothik(Creature* pCreature) { - return new boss_gothikAI (_Creature); + return new boss_gothikAI (pCreature); } -CreatureAI* GetAI_mob_gothik_minion(Creature *_Creature) +CreatureAI* GetAI_mob_gothik_minion(Creature* pCreature) { - return new mob_gothik_minionAI (_Creature); + return new mob_gothik_minionAI (pCreature); } void AddSC_boss_gothik() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp index ebb39bf54cc..9195e0e7828 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp @@ -88,9 +88,9 @@ struct TRINITY_DLL_DECL boss_grobbulusAI : public BossAI } }; -CreatureAI* GetAI_boss_grobbulus(Creature *_Creature) +CreatureAI* GetAI_boss_grobbulus(Creature* pCreature) { - return new boss_grobbulusAI (_Creature); + return new boss_grobbulusAI (pCreature); } void AddSC_boss_grobbulus() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp index b653ee802c8..8491ab95703 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp @@ -135,9 +135,9 @@ struct TRINITY_DLL_DECL boss_heiganAI : public BossAI } }; -CreatureAI* GetAI_boss_heigan(Creature *_Creature) +CreatureAI* GetAI_boss_heigan(Creature* pCreature) { - return new boss_heiganAI (_Creature); + return new boss_heiganAI (pCreature); } void AddSC_boss_heigan() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp index e949fc78b18..9bef8ebd3f9 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp @@ -163,9 +163,9 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_highlord_mograine(Creature *_Creature) +CreatureAI* GetAI_boss_highlord_mograine(Creature* pCreature) { - return new boss_highlord_mograineAI (_Creature); + return new boss_highlord_mograineAI (pCreature); } void AddSC_boss_highlord_mograine() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp index b5f40695f0b..cb97097ad4c 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp @@ -279,9 +279,9 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI } }; -CreatureAI* GetAI_boss_kelthuzadAI(Creature *_Creature) +CreatureAI* GetAI_boss_kelthuzadAI(Creature* pCreature) { - return new boss_kelthuzadAI (_Creature); + return new boss_kelthuzadAI (pCreature); } void AddSC_boss_kelthuzad() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp index 83cc43b1ce0..eb53583752f 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp @@ -74,9 +74,9 @@ struct TRINITY_DLL_DECL boss_loathebAI : public BossAI } }; -CreatureAI* GetAI_boss_loatheb(Creature *_Creature) +CreatureAI* GetAI_boss_loatheb(Creature* pCreature) { - return new boss_loathebAI (_Creature); + return new boss_loathebAI (pCreature); } void AddSC_boss_loatheb() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp index dddea4ea5c0..63ffb995cd5 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp @@ -123,9 +123,9 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI } }; -CreatureAI* GetAI_boss_maexxna(Creature *_Creature) +CreatureAI* GetAI_boss_maexxna(Creature* pCreature) { - return new boss_maexxnaAI (_Creature); + return new boss_maexxnaAI (pCreature); } void AddSC_boss_maexxna() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp index 802082029eb..87f9a96ad61 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp @@ -195,9 +195,9 @@ struct TRINITY_DLL_DECL boss_nothAI : public BossAI } }; -CreatureAI* GetAI_boss_noth(Creature *_Creature) +CreatureAI* GetAI_boss_noth(Creature* pCreature) { - return new boss_nothAI (_Creature); + return new boss_nothAI (pCreature); } void AddSC_boss_noth() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp index 0ea88d8a977..d50c72d8fa6 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp @@ -118,9 +118,9 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI } }; -CreatureAI* GetAI_boss_patchwerk(Creature *_Creature) +CreatureAI* GetAI_boss_patchwerk(Creature* pCreature) { - return new boss_patchwerkAI (_Creature); + return new boss_patchwerkAI (pCreature); } void AddSC_boss_patchwerk() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp index 2d96f7bdb82..2ade34b6e6d 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp @@ -113,9 +113,9 @@ struct TRINITY_DLL_DECL boss_razuviousAI : public BossAI } }; -CreatureAI* GetAI_boss_razuvious(Creature *_Creature) +CreatureAI* GetAI_boss_razuvious(Creature* pCreature) { - return new boss_razuviousAI (_Creature); + return new boss_razuviousAI (pCreature); } void AddSC_boss_razuvious() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp index 0607a2604d9..ad175323bf1 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp @@ -331,9 +331,9 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI } }; -CreatureAI* GetAI_boss_sapphiron(Creature *_Creature) +CreatureAI* GetAI_boss_sapphiron(Creature* pCreature) { - return new boss_sapphironAI (_Creature); + return new boss_sapphironAI (pCreature); } void AddSC_boss_sapphiron() diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp index 82193f381d0..b40b5aca876 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp @@ -128,9 +128,9 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI } }; -CreatureAI* GetAI_boss_thaddius(Creature *_Creature) +CreatureAI* GetAI_boss_thaddius(Creature* pCreature) { - return new boss_thaddiusAI (_Creature); + return new boss_thaddiusAI (pCreature); } void AddSC_boss_thaddius() diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index 35e08031d3f..f63147489d4 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -277,9 +277,9 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI } } }; -CreatureAI* GetAI_npc_manaforge_control_console(Creature *_Creature) +CreatureAI* GetAI_npc_manaforge_control_console(Creature* pCreature) { - return new npc_manaforge_control_consoleAI (_Creature); + return new npc_manaforge_control_consoleAI (pCreature); } /*###### @@ -601,9 +601,9 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_commander_dawnforge(Creature* _Creature) +CreatureAI* GetAI_npc_commander_dawnforge(Creature* pCreature) { - return new npc_commander_dawnforgeAI(_Creature); + return new npc_commander_dawnforgeAI(pCreature); } bool AreaTrigger_at_commander_dawnforge(Player* pPlayer, AreaTriggerEntry *at) @@ -636,24 +636,24 @@ bool AreaTrigger_at_commander_dawnforge(Player* pPlayer, AreaTriggerEntry *at) #define QUEST_DIMENSIUS 10439 #define QUEST_ON_NETHERY_WINGS 10438 -bool GossipHello_npc_professor_dabiri(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_professor_dabiri(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(29778, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { - _Creature->CastSpell(pPlayer, SPELL_PHASE_DISTRUPTOR, false); + pCreature->CastSpell(pPlayer, SPELL_PHASE_DISTRUPTOR, false); pPlayer->CLOSE_GOSSIP_MENU(); } @@ -782,9 +782,9 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_phase_hunter(Creature *_Creature) +CreatureAI* GetAI_mob_phase_hunter(Creature* pCreature) { - return new mob_phase_hunterAI (_Creature); + return new mob_phase_hunterAI (pCreature); } /*###### @@ -881,9 +881,9 @@ bool QuestAccept_npc_bessy(Player* pPlayer, Creature* creature, Quest const* que return true; } -CreatureAI* GetAI_npc_bessy(Creature *_Creature) +CreatureAI* GetAI_npc_bessy(Creature* pCreature) { - npc_bessyAI* bessyAI = new npc_bessyAI(_Creature); + npc_bessyAI* bessyAI = new npc_bessyAI(pCreature); bessyAI->AddWaypoint(0, 2488.77, 2184.89, 104.64); bessyAI->AddWaypoint(1, 2478.72, 2184.77, 98.58); diff --git a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp b/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp index 06019cc2b0b..b187fa10656 100644 --- a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp @@ -154,9 +154,9 @@ struct TRINITY_DLL_DECL boss_malygosAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_malygos(Creature *_Creature) +CreatureAI* GetAI_boss_malygos(Creature* pCreature) { - return new boss_malygosAI (_Creature); + return new boss_malygosAI (pCreature); } void AddSC_boss_malygos() diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp index 3d597ae58b1..832dc9274e2 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp @@ -218,9 +218,9 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_anomalus(Creature *_Creature) +CreatureAI* GetAI_boss_anomalus(Creature* pCreature) { - return new boss_anomalusAI (_Creature); + return new boss_anomalusAI (pCreature); } struct TRINITY_DLL_DECL mob_chaotic_riftAI : public Scripted_NoMovementAI @@ -281,9 +281,9 @@ struct TRINITY_DLL_DECL mob_chaotic_riftAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_mob_chaotic_rift(Creature *_Creature) +CreatureAI* GetAI_mob_chaotic_rift(Creature* pCreature) { - return new mob_chaotic_riftAI (_Creature); + return new mob_chaotic_riftAI (pCreature); } void AddSC_boss_anomalus() diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp index 9468bc52664..072e6db1a1f 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp @@ -221,9 +221,9 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_keristrasza(Creature *_Creature) +CreatureAI* GetAI_boss_keristrasza(Creature* pCreature) { - return new boss_keristraszaAI (_Creature); + return new boss_keristraszaAI (pCreature); } bool GOHello_containment_sphere(Player *pPlayer, GameObject *pGO) diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp index 58a0e928381..2fe856cea05 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp @@ -301,9 +301,9 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_magus_telestra(Creature *_Creature) +CreatureAI* GetAI_boss_magus_telestra(Creature* pCreature) { - return new boss_magus_telestraAI (_Creature); + return new boss_magus_telestraAI (pCreature); } void AddSC_boss_magus_telestra() diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp index 6f5bfe1f269..d55e8514cc6 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp @@ -275,19 +275,19 @@ struct TRINITY_DLL_DECL mob_crystalline_tanglerAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_crystal_spike(Creature *_Creature) +CreatureAI* GetAI_mob_crystal_spike(Creature* pCreature) { - return new mob_crystal_spikeAI (_Creature); + return new mob_crystal_spikeAI (pCreature); } -CreatureAI* GetAI_mob_crystalline_tangler(Creature *_Creature) +CreatureAI* GetAI_mob_crystalline_tangler(Creature* pCreature) { - return new mob_crystalline_tanglerAI (_Creature); + return new mob_crystalline_tanglerAI (pCreature); } -CreatureAI* GetAI_boss_ormorok(Creature *_Creature) +CreatureAI* GetAI_boss_ormorok(Creature* pCreature) { - return new boss_ormorokAI (_Creature); + return new boss_ormorokAI (pCreature); } void AddSC_boss_ormorok() diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp index afb6fd59821..a28deb89264 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp @@ -41,9 +41,9 @@ struct TRINITY_DLL_DECL boss_commander_kolurgAI : public ScriptedAI void JustDied(Unit* killer) {} }; -CreatureAI* GetAI_boss_commander_kolurg(Creature *_Creature) +CreatureAI* GetAI_boss_commander_kolurg(Creature* pCreature) { - return new boss_commander_kolurgAI (_Creature); + return new boss_commander_kolurgAI (pCreature); } void AddSC_boss_commander_kolurg() diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp index 532e982f5e6..1bacd679e25 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp @@ -47,9 +47,9 @@ struct TRINITY_DLL_DECL boss_commander_stoutbeardAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_commander_stoutbeard(Creature *_Creature) +CreatureAI* GetAI_boss_commander_stoutbeard(Creature* pCreature) { - return new boss_commander_stoutbeardAI (_Creature); + return new boss_commander_stoutbeardAI (pCreature); } void AddSC_boss_commander_stoutbeard() diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp index 06827070ea0..bde90bf021e 100644 --- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp @@ -66,9 +66,9 @@ struct TRINITY_DLL_DECL boss_drakosAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_drakos(Creature *_Creature) +CreatureAI* GetAI_boss_drakos(Creature* pCreature) { - return new boss_drakosAI (_Creature); + return new boss_drakosAI (pCreature); } void AddSC_boss_drakos() diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp index 3eee234fdd1..cc3fa3b3043 100644 --- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp @@ -88,9 +88,9 @@ struct TRINITY_DLL_DECL boss_eregosAI : public ScriptedAI void JustDied(Unit* killer) {} }; -CreatureAI* GetAI_boss_eregos(Creature *_Creature) +CreatureAI* GetAI_boss_eregos(Creature* pCreature) { - return new boss_eregosAI (_Creature); + return new boss_eregosAI (pCreature); } void AddSC_boss_eregos() diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp index d3f5a08ecbd..1f34ecefbbd 100644 --- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp @@ -71,9 +71,9 @@ struct TRINITY_DLL_DECL boss_uromAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_urom(Creature *_Creature) +CreatureAI* GetAI_boss_urom(Creature* pCreature) { - return new boss_uromAI (_Creature); + return new boss_uromAI (pCreature); } void AddSC_boss_urom() diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp index 908e7bedbf8..299c54dd8dc 100644 --- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp @@ -69,9 +69,9 @@ struct TRINITY_DLL_DECL boss_varosAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_varos(Creature *_Creature) +CreatureAI* GetAI_boss_varos(Creature* pCreature) { - return new boss_varosAI (_Creature); + return new boss_varosAI (pCreature); } void AddSC_boss_varos() diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp index 4925762d6aa..35608557dad 100644 --- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp +++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp @@ -291,9 +291,9 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_onyxiaAI(Creature *_Creature) +CreatureAI* GetAI_boss_onyxiaAI(Creature* pCreature) { - return new boss_onyxiaAI (_Creature); + return new boss_onyxiaAI (pCreature); } void AddSC_boss_onyxia() diff --git a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp index 03c733576a8..632b0e5898a 100644 --- a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp @@ -37,25 +37,25 @@ EndContentData */ #define GOSSIP_HNF "You may speak frankly, Neeru..." #define GOSSIP_SNF "[PH] ..." -bool GossipHello_npc_neeru_fireblade(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_5727) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(4513, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4513, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(4513, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(4513, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); @@ -139,9 +139,9 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_shenthul(Creature *_Creature) +CreatureAI* GetAI_npc_shenthul(Creature* pCreature) { - return new npc_shenthulAI (_Creature); + return new npc_shenthulAI (pCreature); } bool QuestAccept_npc_shenthul(Player* pPlayer, Creature* creature, Quest const* quest) @@ -207,50 +207,50 @@ struct TRINITY_DLL_DECL npc_thrall_warchiefAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_npc_thrall_warchief(Creature *_Creature) +CreatureAI* GetAI_npc_thrall_warchief(Creature* pCreature) { - return new npc_thrall_warchiefAI (_Creature); + return new npc_thrall_warchiefAI (pCreature); } -bool GossipHello_npc_thrall_warchief(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_thrall_warchief(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HTW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_thrall_warchief(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_thrall_warchief(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(5733, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5733, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(5734, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5734, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(5735, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5735, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(5736, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5736, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(5737, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5737, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - pPlayer->SEND_GOSSIP_MENU(5738, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5738, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp index 89fff0d3fd7..2ecccaf2980 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp @@ -114,9 +114,9 @@ struct TRINITY_DLL_DECL boss_amnennar_the_coldbringerAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_amnennar_the_coldbringer(Creature *_Creature) +CreatureAI* GetAI_boss_amnennar_the_coldbringer(Creature* pCreature) { - return new boss_amnennar_the_coldbringerAI (_Creature); + return new boss_amnennar_the_coldbringerAI (pCreature); } void AddSC_boss_amnennar_the_coldbringer() diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp index 53707ff657d..6a8497d6f06 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp @@ -174,14 +174,14 @@ struct TRINITY_DLL_DECL npc_deaths_head_ward_keeperAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_deaths_head_ward_keeper(Creature *_Creature) +CreatureAI* GetAI_npc_deaths_head_ward_keeper(Creature* pCreature) { - return new npc_deaths_head_ward_keeperAI(_Creature); + return new npc_deaths_head_ward_keeperAI(pCreature); } -CreatureAI* GetAI_npc_willix(Creature *_Creature) +CreatureAI* GetAI_npc_willix(Creature* pCreature) { - npc_willixAI* thisAI = new npc_willixAI(_Creature); + npc_willixAI* thisAI = new npc_willixAI(pCreature); thisAI->AddWaypoint(0, 2194.38, 1791.65, 65.48, 5000); thisAI->AddWaypoint(1, 2188.56, 1805.87, 64.45); diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp index b76684bff26..eefedb2c0d5 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -92,9 +92,9 @@ struct TRINITY_DLL_DECL boss_ayamissAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_ayamiss(Creature *_Creature) +CreatureAI* GetAI_boss_ayamiss(Creature* pCreature) { - return new boss_ayamissAI (_Creature); + return new boss_ayamissAI (pCreature); } void AddSC_boss_ayamiss() diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index 69d1babf173..e781c749d0d 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -78,9 +78,9 @@ struct TRINITY_DLL_DECL boss_kurinnaxxAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_kurinnaxx(Creature *_Creature) +CreatureAI* GetAI_boss_kurinnaxx(Creature* pCreature) { - return new boss_kurinnaxxAI (_Creature); + return new boss_kurinnaxxAI (pCreature); } void AddSC_boss_kurinnaxx() diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp index df542a69693..4d62a923e16 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp @@ -104,9 +104,9 @@ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_moam(Creature *_Creature) +CreatureAI* GetAI_boss_moam(Creature* pCreature) { - return new boss_moamAI (_Creature); + return new boss_moamAI (pCreature); } void AddSC_boss_moam() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp index 454abb1602d..363b4ccab27 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp @@ -112,9 +112,9 @@ struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_arcanist_doan(Creature *_Creature) +CreatureAI* GetAI_boss_arcanist_doan(Creature* pCreature) { - return new boss_arcanist_doanAI (_Creature); + return new boss_arcanist_doanAI (pCreature); } void AddSC_boss_arcanist_doan() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp index 1f49751e08c..e133d52b41b 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -82,9 +82,9 @@ struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_azshir_the_sleepless(Creature *_Creature) +CreatureAI* GetAI_boss_azshir_the_sleepless(Creature* pCreature) { - return new boss_azshir_the_sleeplessAI (_Creature); + return new boss_azshir_the_sleeplessAI (pCreature); } void AddSC_boss_azshir_the_sleepless() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp index c8ca71dff7c..84febc690d1 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -108,9 +108,9 @@ struct TRINITY_DLL_DECL boss_bloodmage_thalnosAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_bloodmage_thalnos(Creature *_Creature) +CreatureAI* GetAI_boss_bloodmage_thalnos(Creature* pCreature) { - return new boss_bloodmage_thalnosAI (_Creature); + return new boss_bloodmage_thalnosAI (pCreature); } void AddSC_boss_bloodmage_thalnos() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp index 17c7f0e52b2..9c785145eff 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp @@ -814,24 +814,24 @@ bool GOHello_go_loosely_turned_soil(Player* pPlayer, GameObject* soil) return true; } -CreatureAI* GetAI_mob_head(Creature *_Creature) +CreatureAI* GetAI_mob_head(Creature* pCreature) { - return new mob_headAI (_Creature); + return new mob_headAI (pCreature); } -CreatureAI* GetAI_boss_headless_horseman(Creature *_Creature) +CreatureAI* GetAI_boss_headless_horseman(Creature* pCreature) { - return new boss_headless_horsemanAI (_Creature); + return new boss_headless_horsemanAI (pCreature); } -CreatureAI* GetAI_mob_pulsing_pumpkin(Creature *_Creature) +CreatureAI* GetAI_mob_pulsing_pumpkin(Creature* pCreature) { - return new mob_pulsing_pumpkinAI (_Creature); + return new mob_pulsing_pumpkinAI (pCreature); } -CreatureAI* GetAI_mob_wisp_invis(Creature *_Creature) +CreatureAI* GetAI_mob_wisp_invis(Creature* pCreature) { - return new mob_wisp_invisAI (_Creature); + return new mob_wisp_invisAI (pCreature); } void AddSC_boss_headless_horseman() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index 12f2a66e885..d94a55bfad5 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -117,9 +117,9 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_high_inquisitor_fairbanks(Creature *_Creature) +CreatureAI* GetAI_boss_high_inquisitor_fairbanks(Creature* pCreature) { - return new boss_high_inquisitor_fairbanksAI (_Creature); + return new boss_high_inquisitor_fairbanksAI (pCreature); } void AddSC_boss_high_inquisitor_fairbanks() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp index 641432604af..7d5b6a2dbd2 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -61,9 +61,9 @@ struct TRINITY_DLL_DECL boss_houndmaster_lokseyAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_houndmaster_loksey(Creature *_Creature) +CreatureAI* GetAI_boss_houndmaster_loksey(Creature* pCreature) { - return new boss_houndmaster_lokseyAI (_Creature); + return new boss_houndmaster_lokseyAI (pCreature); } void AddSC_boss_houndmaster_loksey() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp index 3db07afbfdd..cfbc0518826 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp @@ -102,9 +102,9 @@ struct TRINITY_DLL_DECL boss_interrogator_vishasAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_interrogator_vishas(Creature *_Creature) +CreatureAI* GetAI_boss_interrogator_vishas(Creature* pCreature) { - return new boss_interrogator_vishasAI (_Creature); + return new boss_interrogator_vishasAI (pCreature); } void AddSC_boss_interrogator_vishas() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp index d28e2620138..95a421fed13 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -333,14 +333,14 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_scarlet_commander_mograine(Creature *_Creature) +CreatureAI* GetAI_boss_scarlet_commander_mograine(Creature* pCreature) { - return new boss_scarlet_commander_mograineAI (_Creature); + return new boss_scarlet_commander_mograineAI (pCreature); } -CreatureAI* GetAI_boss_high_inquisitor_whitemane(Creature *_Creature) +CreatureAI* GetAI_boss_high_inquisitor_whitemane(Creature* pCreature) { - return new boss_high_inquisitor_whitemaneAI (_Creature); + return new boss_high_inquisitor_whitemaneAI (pCreature); } void AddSC_boss_mograine_and_whitemane() diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp index d4e2a1f5f69..fa54e594783 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp @@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL boss_scornAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_scorn(Creature *_Creature) +CreatureAI* GetAI_boss_scorn(Creature* pCreature) { - return new boss_scornAI (_Creature); + return new boss_scornAI (pCreature); } void AddSC_boss_scorn() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp index 5ccf476fa1d..a5f32d9bde1 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp @@ -210,9 +210,9 @@ struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_darkmaster_gandling(Creature *_Creature) +CreatureAI* GetAI_boss_darkmaster_gandling(Creature* pCreature) { - return new boss_darkmaster_gandlingAI (_Creature); + return new boss_darkmaster_gandlingAI (pCreature); } void AddSC_boss_darkmaster_gandling() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp index 5840b782575..d4c19cc6dd6 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp @@ -43,9 +43,9 @@ struct TRINITY_DLL_DECL boss_death_knight_darkreaverAI : public ScriptedAI { } }; -CreatureAI* GetAI_boss_death_knight_darkreaver(Creature *_Creature) +CreatureAI* GetAI_boss_death_knight_darkreaver(Creature* pCreature) { - return new boss_death_knight_darkreaverAI (_Creature); + return new boss_death_knight_darkreaverAI (pCreature); } void AddSC_boss_death_knight_darkreaver() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp index d9486080b1b..badea0761e4 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp @@ -95,9 +95,9 @@ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_theolenkrastinov(Creature *_Creature) +CreatureAI* GetAI_boss_theolenkrastinov(Creature* pCreature) { - return new boss_theolenkrastinovAI (_Creature); + return new boss_theolenkrastinovAI (pCreature); } void AddSC_boss_theolenkrastinov() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp index dc7da4af19c..0fd36025676 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp @@ -101,9 +101,9 @@ struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_illuciabarov(Creature *_Creature) +CreatureAI* GetAI_boss_illuciabarov(Creature* pCreature) { - return new boss_illuciabarovAI (_Creature); + return new boss_illuciabarovAI (pCreature); } void AddSC_boss_illuciabarov() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp index 914995a8777..b7ae2422c92 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp @@ -137,9 +137,9 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_instructormalicia(Creature *_Creature) +CreatureAI* GetAI_boss_instructormalicia(Creature* pCreature) { - return new boss_instructormaliciaAI (_Creature); + return new boss_instructormaliciaAI (pCreature); } void AddSC_boss_instructormalicia() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp index 9ce096514df..9996479177f 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp @@ -196,14 +196,14 @@ struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI }; -CreatureAI* GetAI_boss_jandicebarov(Creature *_Creature) +CreatureAI* GetAI_boss_jandicebarov(Creature* pCreature) { - return new boss_jandicebarovAI (_Creature); + return new boss_jandicebarovAI (pCreature); } -CreatureAI* GetAI_mob_illusionofjandicebarov(Creature *_Creature) +CreatureAI* GetAI_mob_illusionofjandicebarov(Creature* pCreature) { - return new mob_illusionofjandicebarovAI (_Creature); + return new mob_illusionofjandicebarovAI (pCreature); } diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp index a96c24a8253..c67a49926f9 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp @@ -142,9 +142,9 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_kormok(Creature *_Creature) +CreatureAI* GetAI_boss_kormok(Creature* pCreature) { - return new boss_kormokAI (_Creature); + return new boss_kormokAI (pCreature); } void AddSC_boss_kormok() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp index 27db649626f..f8b21ebfd55 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp @@ -83,9 +83,9 @@ struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_lordalexeibarov(Creature *_Creature) +CreatureAI* GetAI_boss_lordalexeibarov(Creature* pCreature) { - return new boss_lordalexeibarovAI (_Creature); + return new boss_lordalexeibarovAI (pCreature); } void AddSC_boss_lordalexeibarov() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp index b37be7c3129..489e8bbc1cb 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp @@ -98,9 +98,9 @@ struct TRINITY_DLL_DECL boss_lorekeeperpolkeltAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_lorekeeperpolkelt(Creature *_Creature) +CreatureAI* GetAI_boss_lorekeeperpolkelt(Creature* pCreature) { - return new boss_lorekeeperpolkeltAI (_Creature); + return new boss_lorekeeperpolkeltAI (pCreature); } void AddSC_boss_lorekeeperpolkelt() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp index 9c0c8e29ff4..105beb13375 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp @@ -110,9 +110,9 @@ struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_rasfrost(Creature *_Creature) +CreatureAI* GetAI_boss_rasfrost(Creature* pCreature) { - return new boss_rasfrostAI (_Creature); + return new boss_rasfrostAI (pCreature); } void AddSC_boss_rasfrost() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp index 31eca51391c..ea355c401a3 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp @@ -101,9 +101,9 @@ struct TRINITY_DLL_DECL boss_theravenianAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_theravenian(Creature *_Creature) +CreatureAI* GetAI_boss_theravenian(Creature* pCreature) { - return new boss_theravenianAI (_Creature); + return new boss_theravenianAI (pCreature); } void AddSC_boss_theravenian() diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp index d82c749fbad..9d343d26a7e 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp @@ -82,9 +82,9 @@ struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_vectus(Creature *_Creature) +CreatureAI* GetAI_boss_vectus(Creature* pCreature) { - return new boss_vectusAI (_Creature); + return new boss_vectusAI (pCreature); } void AddSC_boss_vectus() diff --git a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp index f82e5b362a7..5079fbd155b 100644 --- a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp +++ b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp @@ -33,30 +33,30 @@ EndContentData */ ## npc_kalaran_windblade ######*/ -bool GossipHello_npc_kalaran_windblade(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_kalaran_windblade(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(3441) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me what drives this vengance?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_kalaran_windblade(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_kalaran_windblade(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Continue please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(1954, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1954, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let me confer with my colleagues", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1955, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1955, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); @@ -70,20 +70,20 @@ bool GossipSelect_npc_kalaran_windblade(Player* pPlayer, Creature *_Creature, ui ## npc_lothos_riftwaker ######*/ -bool GossipHello_npc_lothos_riftwaker(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_lothos_riftwaker(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestRewardStatus(7487) || pPlayer->GetQuestRewardStatus(7848)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport me to the Molten Core", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_lothos_riftwaker(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_lothos_riftwaker(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) { @@ -98,30 +98,30 @@ bool GossipSelect_npc_lothos_riftwaker(Player* pPlayer, Creature *_Creature, uin ## npc_zamael_lunthistle ######*/ -bool GossipHello_npc_zamael_lunthistle(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_zamael_lunthistle(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(3377) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(1920, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1920, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_zamael_lunthistle(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_zamael_lunthistle(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(1921, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1921, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Goodbye", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1922, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1922, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp index d3c26f6345c..089a66fa7d4 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp @@ -175,9 +175,9 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_doomwalker(Creature *_Creature) +CreatureAI* GetAI_boss_doomwalker(Creature* pCreature) { - return new boss_doomwalkerAI (_Creature); + return new boss_doomwalkerAI (pCreature); } void AddSC_boss_doomwalker() diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index ea3a5a976f8..77d8b52cd1b 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -301,9 +301,9 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_enslaved_netherwing_drake(Creature* _Creature) +CreatureAI* GetAI_mob_enslaved_netherwing_drake(Creature* pCreature) { - return new mob_enslaved_netherwing_drakeAI(_Creature); + return new mob_enslaved_netherwing_drakeAI(pCreature); } /*##### @@ -374,29 +374,29 @@ struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_dragonmaw_peon(Creature* _Creature) +CreatureAI* GetAI_mob_dragonmaw_peon(Creature* pCreature) { - return new mob_dragonmaw_peonAI(_Creature); + return new mob_dragonmaw_peonAI(pCreature); } /*###### ## npc_drake_dealer_hurlunk ######*/ -bool GossipHello_npc_drake_dealer_hurlunk(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_drake_dealer_hurlunk(Player* pPlayer, Creature* pCreature) { - if (_Creature->isVendor() && pPlayer->GetReputationRank(1015) == REP_EXALTED) + if (pCreature->isVendor() && pPlayer->GetReputationRank(1015) == REP_EXALTED) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_drake_dealer_hurlunk(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_drake_dealer_hurlunk(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -408,19 +408,19 @@ bool GossipSelect_npc_drake_dealer_hurlunk(Player* pPlayer, Creature *_Creature, #define GOSSIP_HSK1 "Take Flanis's Pack" #define GOSSIP_HSK2 "Take Kagrosh's Pack" -bool GossipHello_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature *_Creature) +bool GossipHello_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658,1,true)) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659,1,true)) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { @@ -458,48 +458,48 @@ bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature *_ #define GOSSIP_SMO4 "Who are these bidders?" #define GOSSIP_SMO5 "Well... yes." -bool GossipHello_npc_murkblood_overseer(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_murkblood_overseer(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_murkblood_overseer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_murkblood_overseer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: //correct id not known - pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); - _Creature->CastSpell(pPlayer,41121,false); + pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); + pCreature->CastSpell(pPlayer,41121,false); pPlayer->AreaExploredOrEventHappens(QUEST_11082); break; } @@ -515,34 +515,34 @@ bool GossipSelect_npc_murkblood_overseer(Player* pPlayer, Creature *_Creature, u #define GOSSIP_SN2 "Your mate?" #define GOSSIP_SN3 "I have battled many beasts, dragon. I will help you." -bool GossipHello_npc_neltharaku(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_neltharaku(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(10814) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10613, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10613, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_neltharaku(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_neltharaku(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { 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(10614, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10614, pCreature->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(10615, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10615, pCreature->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(10616, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10616, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); @@ -564,53 +564,53 @@ bool GossipSelect_npc_neltharaku(Player* pPlayer, Creature *_Creature, uint32 se #define GOSSIP_ORONOK6 "So what of the cipher now? And your boys?" #define GOSSIP_ORONOK7 "I will find your boys and the cipher, Oronok." -bool GossipHello_npc_oronok_tornheart(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - if (_Creature->isVendor()) + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (pCreature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (pPlayer->GetQuestStatus(10519) == QUEST_STATUS_INCOMPLETE) { pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(10312, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10312, pCreature->GetGUID()); }else - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10313, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10313, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(10314, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10314, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(10315, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10315, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(10316, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10316, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(10317, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10317, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(10318, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(10318, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->CLOSE_GOSSIP_MENU(); @@ -835,17 +835,17 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_overlord_morghorAI(Creature *_Creature) +CreatureAI* GetAI_npc_overlord_morghorAI(Creature* pCreature) { -return new npc_overlord_morghorAI(_Creature); +return new npc_overlord_morghorAI(pCreature); } -bool QuestAccept_npc_overlord_morghor(Player* pPlayer, Creature *_Creature, const Quest *_Quest) +bool QuestAccept_npc_overlord_morghor(Player* pPlayer, Creature* pCreature, const Quest *_Quest) { if (_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE) { - CAST_AI(npc_overlord_morghorAI, _Creature->AI())->PlayerGUID = pPlayer->GetGUID(); - CAST_AI(npc_overlord_morghorAI, _Creature->AI())->StartEvent(); + CAST_AI(npc_overlord_morghorAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_overlord_morghorAI, pCreature->AI())->StartEvent(); return true; } return false; @@ -994,9 +994,9 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI } }; -CreatureAI* GetAI_npc_earthmender_wildaAI(Creature *_Creature) +CreatureAI* GetAI_npc_earthmender_wildaAI(Creature* pCreature) { - npc_earthmender_wildaAI* earthmender_wildaAI = new npc_earthmender_wildaAI(_Creature); + npc_earthmender_wildaAI* earthmender_wildaAI = new npc_earthmender_wildaAI(pCreature); earthmender_wildaAI->AddWaypoint(0, -2637.466064, 1359.977905, 35.889114, 2000); // SAY_START earthmender_wildaAI->AddWaypoint(1, -2666.364990, 1348.222656, 34.445557); @@ -1765,9 +1765,9 @@ struct TRINITY_DLL_DECL npc_enraged_spiritAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_enraged_spirit(Creature *_Creature) +CreatureAI* GetAI_npc_enraged_spirit(Creature* pCreature) { -return new npc_enraged_spiritAI(_Creature); +return new npc_enraged_spiritAI(pCreature); } /*##### diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp index 30b78188bab..236cb6a703a 100644 --- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp @@ -82,27 +82,27 @@ struct TRINITY_DLL_DECL npc_raliq_the_drunkAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_raliq_the_drunk(Creature *_Creature) +CreatureAI* GetAI_npc_raliq_the_drunk(Creature* pCreature) { - return new npc_raliq_the_drunkAI (_Creature); + return new npc_raliq_the_drunkAI (pCreature); } -bool GossipHello_npc_raliq_the_drunk(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9440, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9440, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_raliq_the_drunk(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->setFaction(FACTION_HOSTILE_RD); - _Creature->AI()->AttackStart(pPlayer); + pCreature->setFaction(FACTION_HOSTILE_RD); + pCreature->AI()->AttackStart(pPlayer); } return true; } @@ -156,23 +156,23 @@ struct TRINITY_DLL_DECL npc_salsalabimAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_npc_salsalabim(Creature *_Creature) +CreatureAI* GetAI_npc_salsalabim(Creature* pCreature) { - return new npc_salsalabimAI (_Creature); + return new npc_salsalabimAI (pCreature); } -bool GossipHello_npc_salsalabim(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_salsalabim(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE) { - _Creature->setFaction(FACTION_HOSTILE_SA); - _Creature->AI()->AttackStart(pPlayer); + pCreature->setFaction(FACTION_HOSTILE_SA); + pCreature->AI()->AttackStart(pPlayer); } else { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); } return true; } @@ -188,43 +188,43 @@ Purchase requires exalted reputation with Scryers/Aldor, Cenarion Expedition and ################################################## */ -bool GossipHello_npc_shattrathflaskvendors(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_shattrathflaskvendors(Player* pPlayer, Creature* pCreature) { - if (_Creature->GetEntry() == 23484) + if (pCreature->GetEntry() == 23484) { // Aldor vendor - if (_Creature->isVendor() && (pPlayer->GetReputationRank(932) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) + if (pCreature->isVendor() && (pPlayer->GetReputationRank(932) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(11085, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(11085, pCreature->GetGUID()); } else { - pPlayer->SEND_GOSSIP_MENU(11083, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(11083, pCreature->GetGUID()); } } - if (_Creature->GetEntry() == 23483) + if (pCreature->GetEntry() == 23483) { // Scryers vendor - if (_Creature->isVendor() && (pPlayer->GetReputationRank(934) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) + if (pCreature->isVendor() && (pPlayer->GetReputationRank(934) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(11085, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(11085, pCreature->GetGUID()); } else { - pPlayer->SEND_GOSSIP_MENU(11084, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(11084, pCreature->GetGUID()); } } return true; } -bool GossipSelect_npc_shattrathflaskvendors(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_shattrathflaskvendors(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -235,17 +235,17 @@ bool GossipSelect_npc_shattrathflaskvendors(Player* pPlayer, Creature *_Creature #define GOSSIP_HZ "Take me to the Caverns of Time." -bool GossipHello_npc_zephyr(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_zephyr(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetReputationRank(989) >= REP_REVERED) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_zephyr(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_zephyr(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) pPlayer->CastSpell(pPlayer,37778,false); @@ -354,9 +354,9 @@ public: npc_escortAI::UpdateAI(diff); } }; -CreatureAI* GetAI_npc_kservantAI(Creature *_Creature) +CreatureAI* GetAI_npc_kservantAI(Creature* pCreature) { - npc_kservantAI* kservantAI = new npc_kservantAI(_Creature); + npc_kservantAI* kservantAI = new npc_kservantAI(pCreature); kservantAI->FillPointMovementListForCreature(); @@ -541,9 +541,9 @@ bool GossipSelect_npc_dirty_larry(Player* pPlayer, Creature *creature, uint32 se return true; } -CreatureAI* GetAI_npc_dirty_larryAI(Creature *_Creature) +CreatureAI* GetAI_npc_dirty_larryAI(Creature* pCreature) { - return new npc_dirty_larryAI (_Creature); + return new npc_dirty_larryAI (pCreature); } /*###### @@ -553,25 +553,25 @@ CreatureAI* GetAI_npc_dirty_larryAI(Creature *_Creature) #define ISANAH_GOSSIP_1 "Who are the Sha'tar?" #define ISANAH_GOSSIP_2 "Isn't Shattrath a draenei city? Why do you allow others here?" -bool GossipHello_npc_ishanah(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_ishanah(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_ishanah(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_ishanah(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) - pPlayer->SEND_GOSSIP_MENU(9458, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9458, pCreature->GetGUID()); else if (action == GOSSIP_ACTION_INFO_DEF+2) - pPlayer->SEND_GOSSIP_MENU(9459, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9459, pCreature->GetGUID()); return true; } diff --git a/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp b/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp index 6e40d6e05bb..738170788e6 100644 --- a/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp +++ b/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp @@ -111,56 +111,56 @@ struct TRINITY_DLL_DECL npc_injured_rainspeaker_oracleAI : public npc_escortAI } } - void UpdateAI(Player* pPlayer, Creature *_Creature,const uint32 diff) + void UpdateAI(Player* pPlayer, Creature* pCreature,const uint32 diff) { npc_escortAI::UpdateAI(diff); } }; -bool GossipHello_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->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(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { - 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); + 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); switch (pPlayer->GetTeam()){ case ALLIANCE: - _Creature->setFaction(FACTION_ESCORTEE_A); + pCreature->setFaction(FACTION_ESCORTEE_A); break; case HORDE: - _Creature->setFaction(FACTION_ESCORTEE_H); + pCreature->setFaction(FACTION_ESCORTEE_H); break; } } return true; } -bool QuestAccept_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature *_Creature, Quest const *_Quest) +bool QuestAccept_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature, Quest const *_Quest) { - DoScriptText(SAY_QUEST_ACCEPT_IRO,_Creature); + DoScriptText(SAY_QUEST_ACCEPT_IRO, pCreature); return false; } -CreatureAI* GetAI_npc_injured_rainspeaker_oracle(Creature *_Creature) +CreatureAI* GetAI_npc_injured_rainspeaker_oracle(Creature* pCreature) { - npc_injured_rainspeaker_oracleAI* thisAI = new npc_injured_rainspeaker_oracleAI(_Creature); + npc_injured_rainspeaker_oracleAI* thisAI = new npc_injured_rainspeaker_oracleAI(pCreature); thisAI->FillPointMovementListForCreature(); diff --git a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp index d590f0efdef..4d6b73c5cfd 100644 --- a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp +++ b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp @@ -40,49 +40,49 @@ EndContentData */ #define GOSSIP_DEMITRIAN6 "Caught unaware? How?" #define GOSSIP_DEMITRIAN7 "So what did Ragnaros do next?" -bool GossipHello_npc_highlord_demitrian(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_highlord_demitrian(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(7785) == QUEST_STATUS_NONE && (pPlayer->HasItemCount(18563,1,false) || pPlayer->HasItemCount(18564,1,false))) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(6812, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(6812, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_highlord_demitrian(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_highlord_demitrian(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(6842, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(6842, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(6843, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(6843, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(6844, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(6844, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(6867, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(6867, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(6868, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(6868, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(6869, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(6869, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: - pPlayer->SEND_GOSSIP_MENU(6870, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(6870, pCreature->GetGUID()); ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 19016, 1); @@ -117,84 +117,84 @@ bool GossipSelect_npc_highlord_demitrian(Player* pPlayer, Creature *_Creature, u #define TRIGGER_RUTGAR 15222 #define TRIGGER_FRANKAL 15221 -bool GossipHello_npcs_rutgar_and_frankal(Player* pPlayer, Creature *_Creature) +bool GossipHello_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE && - _Creature->GetEntry() == 15170 && + pCreature->GetEntry() == 15170 && !pPlayer->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); if (pPlayer->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE && - _Creature->GetEntry() == 15171 && + pCreature->GetEntry() == 15171 && pPlayer->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); - pPlayer->SEND_GOSSIP_MENU(7754, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7754, pCreature->GetGUID()); return true; } -bool GossipSelect_npcs_rutgar_and_frankal(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(7755, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7755, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(7756, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7756, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(7757, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7757, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(7758, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7758, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(7759, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7759, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(7760, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7760, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: - pPlayer->SEND_GOSSIP_MENU(7761, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7761, pCreature->GetGUID()); //'kill' our trigger to update quest status - pPlayer->KilledMonsterCredit(TRIGGER_RUTGAR, _Creature->GetGUID()); + pPlayer->KilledMonsterCredit(TRIGGER_RUTGAR, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 9: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(7762, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7762, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(7763, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7763, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(7764, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7764, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(7765, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7765, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); - pPlayer->SEND_GOSSIP_MENU(7766, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7766, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 14: - pPlayer->SEND_GOSSIP_MENU(7767, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7767, pCreature->GetGUID()); //'kill' our trigger to update quest status - pPlayer->KilledMonsterCredit(TRIGGER_FRANKAL, _Creature->GetGUID()); + pPlayer->KilledMonsterCredit(TRIGGER_FRANKAL, pCreature->GetGUID()); break; } return true; diff --git a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp index 3e7874a7a54..ee5533f53f4 100644 --- a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp @@ -88,9 +88,9 @@ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_blood_knight_stillblade(Creature *_Creature) +CreatureAI* GetAI_npc_blood_knight_stillblade(Creature* pCreature) { - return new npc_blood_knight_stillbladeAI (_Creature); + return new npc_blood_knight_stillbladeAI (pCreature); } void AddSC_silvermoon_city() diff --git a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp index 0c32470f659..717000d2423 100644 --- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp @@ -54,34 +54,34 @@ struct TRINITY_DLL_DECL npc_astor_hadrenAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_astor_hadren(Creature *_creature) +CreatureAI* GetAI_npc_astor_hadren(Creature* pCreature) { - return new npc_astor_hadrenAI(_creature); + return new npc_astor_hadrenAI(pCreature); } -bool GossipHello_npc_astor_hadren(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_astor_hadren(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(1886) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(623, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(623, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(624, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(624, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->setFaction(21); + pCreature->setFaction(21); if (pPlayer) - CAST_AI(npc_astor_hadrenAI, _Creature->AI())->AttackStart(pPlayer); + CAST_AI(npc_astor_hadrenAI, pCreature->AI())->AttackStart(pPlayer); break; } return true; @@ -177,9 +177,9 @@ bool QuestAccept_npc_deathstalker_erland(Player* pPlayer, Creature* creature, Qu return true; } -CreatureAI* GetAI_npc_deathstalker_erlandAI(Creature *_Creature) +CreatureAI* GetAI_npc_deathstalker_erlandAI(Creature* pCreature) { - npc_deathstalker_erlandAI* deathstalker_erlandAI = new npc_deathstalker_erlandAI(_Creature); + npc_deathstalker_erlandAI* deathstalker_erlandAI = new npc_deathstalker_erlandAI(pCreature); deathstalker_erlandAI->AddWaypoint(0, 1406.32, 1083.10, 52.55); deathstalker_erlandAI->AddWaypoint(1, 1400.49, 1080.42, 52.50); //first say diff --git a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp index de695417a57..9c1d48fca34 100644 --- a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp @@ -39,10 +39,10 @@ EndContentData */ #define GOSSIP_HBD4 "Alexstrasza" #define GOSSIP_HBD5 "Malygos" -bool GossipHello_npc_braug_dimspirit(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(6627) == QUEST_STATUS_INCOMPLETE) { @@ -52,20 +52,20 @@ bool GossipHello_npc_braug_dimspirit(Player* pPlayer, Creature *_Creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(5820, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5820, pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(5819, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5819, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer,6766,false); + pCreature->CastSpell(pPlayer,6766,false); } if (action == GOSSIP_ACTION_INFO_DEF+2) @@ -159,9 +159,9 @@ bool QuestAccept_npc_kaya_flathoof(Player* pPlayer, Creature* creature, Quest co return true; } -CreatureAI* GetAI_npc_kaya_flathoofAI(Creature *_Creature) +CreatureAI* GetAI_npc_kaya_flathoofAI(Creature* pCreature) { - npc_kaya_flathoofAI* kayaAI = new npc_kaya_flathoofAI(_Creature); + npc_kaya_flathoofAI* kayaAI = new npc_kaya_flathoofAI(pCreature); kayaAI->FillPointMovementListForCreature(); diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index b8fe88462ea..18d93be97ca 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -36,25 +36,25 @@ EndContentData */ #define GOSSIP_ITEM_MALIN "Can you send me to Theramore? I have an urgent message for Lady Jaina from Highlord Bolvar." -bool GossipHello_npc_archmage_malin(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_archmage_malin(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(11223) == QUEST_STATUS_COMPLETE && !pPlayer->GetQuestRewardStatus(11223)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MALIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_archmage_malin(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_archmage_malin(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer, 42711, true); + pCreature->CastSpell(pPlayer, 42711, true); } return true; @@ -199,34 +199,34 @@ CreatureAI* GetAI_npc_dashel_stonefist(Creature* pCreature) #define GOSSIP_ITEM_KAT_3 "Begging your pardon, Lady Prestor. That was not my intent." #define GOSSIP_ITEM_KAT_4 "Thank you for your time, Lady Prestor." -bool GossipHello_npc_lady_katrana_prestor(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_lady_katrana_prestor(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(2693, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2693, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_lady_katrana_prestor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_lady_katrana_prestor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(2694, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2694, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(2695, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2695, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(2696, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(2696, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp index 20522d440ad..6f2c787f950 100644 --- a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp +++ b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp @@ -102,9 +102,9 @@ struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_mob_yenniku(Creature *_Creature) +CreatureAI* GetAI_mob_yenniku(Creature* pCreature) { - return new mob_yennikuAI (_Creature); + return new mob_yennikuAI (pCreature); } /*###### diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp index 9d46ad70807..b83637650bb 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp @@ -175,9 +175,9 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_baron_rivendare(Creature *_Creature) +CreatureAI* GetAI_boss_baron_rivendare(Creature* pCreature) { - return new boss_baron_rivendareAI (_Creature); + return new boss_baron_rivendareAI (pCreature); } void AddSC_boss_baron_rivendare() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp index 1906834e184..157c3f166c3 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp @@ -111,9 +111,9 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_baroness_anastari(Creature *_Creature) +CreatureAI* GetAI_boss_baroness_anastari(Creature* pCreature) { - return new boss_baroness_anastariAI (_Creature); + return new boss_baroness_anastariAI (pCreature); } void AddSC_boss_baroness_anastari() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp index fed823ec63a..9d934e87627 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp @@ -205,9 +205,9 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_cannon_master_willey(Creature *_Creature) +CreatureAI* GetAI_boss_cannon_master_willey(Creature* pCreature) { - return new boss_cannon_master_willeyAI (_Creature); + return new boss_cannon_master_willeyAI (pCreature); } void AddSC_boss_cannon_master_willey() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp index 1942b99f056..00506ad880c 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp @@ -201,9 +201,9 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_dathrohan_balnazzar(Creature *_Creature) +CreatureAI* GetAI_boss_dathrohan_balnazzar(Creature* pCreature) { - return new boss_dathrohan_balnazzarAI (_Creature); + return new boss_dathrohan_balnazzarAI (pCreature); } void AddSC_boss_dathrohan_balnazzar() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp index 670b7bc75a2..fc922a4e39a 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp @@ -117,9 +117,9 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_magistrate_barthilas(Creature *_Creature) +CreatureAI* GetAI_boss_magistrate_barthilas(Creature* pCreature) { - return new boss_magistrate_barthilasAI (_Creature); + return new boss_magistrate_barthilasAI (pCreature); } void AddSC_boss_magistrate_barthilas() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp index dbbbc5576d4..358e54cd39c 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp @@ -92,9 +92,9 @@ struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_maleki_the_pallid(Creature *_Creature) +CreatureAI* GetAI_boss_maleki_the_pallid(Creature* pCreature) { - return new boss_maleki_the_pallidAI (_Creature); + return new boss_maleki_the_pallidAI (pCreature); } void AddSC_boss_maleki_the_pallid() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp index 7d6f5e053b7..cd007273cd7 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp @@ -123,9 +123,9 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_nerubenkan(Creature *_Creature) +CreatureAI* GetAI_boss_nerubenkan(Creature* pCreature) { - return new boss_nerubenkanAI (_Creature); + return new boss_nerubenkanAI (pCreature); } void AddSC_boss_nerubenkan() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp index 54847f29fe4..b9b07ad3cbb 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp @@ -140,9 +140,9 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_silver_hand_bossesAI(Creature *_Creature) +CreatureAI* GetAI_boss_silver_hand_bossesAI(Creature* pCreature) { - return new boss_silver_hand_bossesAI (_Creature); + return new boss_silver_hand_bossesAI (pCreature); } void AddSC_boss_order_of_silver_hand() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp index fd28ad481eb..9fd7e550b4f 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp @@ -128,9 +128,9 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_postmaster_malown(Creature *_Creature) +CreatureAI* GetAI_boss_postmaster_malown(Creature* pCreature) { - return new boss_postmaster_malownAI (_Creature); + return new boss_postmaster_malownAI (pCreature); } void AddSC_boss_postmaster_malown() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp index ed6131dff0f..6659e2dfdb1 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp @@ -86,9 +86,9 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_ramstein_the_gorger(Creature *_Creature) +CreatureAI* GetAI_boss_ramstein_the_gorger(Creature* pCreature) { - return new boss_ramstein_the_gorgerAI (_Creature); + return new boss_ramstein_the_gorgerAI (pCreature); } void AddSC_boss_ramstein_the_gorger() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp index ac1eaa4b624..4c72cf76139 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp @@ -67,9 +67,9 @@ struct TRINITY_DLL_DECL boss_timmy_the_cruelAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_timmy_the_cruel(Creature *_Creature) +CreatureAI* GetAI_boss_timmy_the_cruel(Creature* pCreature) { - return new boss_timmy_the_cruelAI (_Creature); + return new boss_timmy_the_cruelAI (pCreature); } void AddSC_boss_timmy_the_cruel() diff --git a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp index a5dfd69fd61..05387558d5a 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp @@ -95,9 +95,9 @@ struct TRINITY_DLL_DECL mob_freed_soulAI : public ScriptedAI void EnterCombat(Unit* who) { } }; -CreatureAI* GetAI_mob_freed_soul(Creature *_Creature) +CreatureAI* GetAI_mob_freed_soul(Creature* pCreature) { - return new mob_freed_soulAI (_Creature); + return new mob_freed_soulAI (pCreature); } /*###### @@ -163,9 +163,9 @@ struct TRINITY_DLL_DECL mob_restless_soulAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_restless_soul(Creature *_Creature) +CreatureAI* GetAI_mob_restless_soul(Creature* pCreature) { - return new mob_restless_soulAI (_Creature); + return new mob_restless_soulAI (pCreature); } /*###### @@ -258,9 +258,9 @@ struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI } }; -CreatureAI* GetAI_mobs_spectral_ghostly_citizen(Creature *_Creature) +CreatureAI* GetAI_mobs_spectral_ghostly_citizen(Creature* pCreature) { - return new mobs_spectral_ghostly_citizenAI (_Creature); + return new mobs_spectral_ghostly_citizenAI (pCreature); } void AddSC_stratholme() diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp index d09ab431b07..980fe656b4a 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp @@ -310,9 +310,9 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_brutallus(Creature *_Creature) +CreatureAI* GetAI_boss_brutallus(Creature* pCreature) { - return new boss_brutallusAI (_Creature); + return new boss_brutallusAI (pCreature); } void AddSC_boss_brutallus() diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp index 2e215d3de05..86ed15ad653 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp @@ -343,9 +343,9 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_sacrolash(Creature *_Creature) +CreatureAI* GetAI_boss_sacrolash(Creature* pCreature) { - return new boss_sacrolashAI (_Creature); + return new boss_sacrolashAI (pCreature); }; struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI @@ -660,9 +660,9 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_boss_alythess(Creature *_Creature) +CreatureAI* GetAI_boss_alythess(Creature* pCreature) { - return new boss_alythessAI (_Creature); + return new boss_alythessAI (pCreature); }; struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI @@ -735,9 +735,9 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_shadow_image(Creature *_Creature) +CreatureAI* GetAI_mob_shadow_image(Creature* pCreature) { - return new mob_shadow_imageAI (_Creature); + return new mob_shadow_imageAI (pCreature); }; void AddSC_boss_eredar_twins() diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp index f4bd81a7b94..8402f077fdd 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp @@ -588,19 +588,19 @@ struct TRINITY_DLL_DECL mob_felmyst_trailAI : public ScriptedAI void UpdateAI(const uint32 diff) {} }; -CreatureAI* GetAI_boss_felmyst(Creature *_Creature) +CreatureAI* GetAI_boss_felmyst(Creature* pCreature) { - return new boss_felmystAI(_Creature); + return new boss_felmystAI(pCreature); } -CreatureAI* GetAI_mob_felmyst_vapor(Creature *_Creature) +CreatureAI* GetAI_mob_felmyst_vapor(Creature* pCreature) { - return new mob_felmyst_vaporAI(_Creature); + return new mob_felmyst_vaporAI(pCreature); } -CreatureAI* GetAI_mob_felmyst_trail(Creature *_Creature) +CreatureAI* GetAI_mob_felmyst_trail(Creature* pCreature) { - return new mob_felmyst_trailAI(_Creature); + return new mob_felmyst_trailAI(pCreature); } void AddSC_boss_felmyst() diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp index 981f067bd01..92a059a328b 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp @@ -653,19 +653,19 @@ bool GOkalecgos_teleporter(Player* pPlayer, GameObject* _GO) return true; } -CreatureAI* GetAI_boss_kalecgos(Creature *_Creature) +CreatureAI* GetAI_boss_kalecgos(Creature* pCreature) { - return new boss_kalecgosAI (_Creature); + return new boss_kalecgosAI (pCreature); } -CreatureAI* GetAI_boss_Sathrovarr(Creature *_Creature) +CreatureAI* GetAI_boss_Sathrovarr(Creature* pCreature) { - return new boss_sathrovarrAI (_Creature); + return new boss_sathrovarrAI (pCreature); } -CreatureAI* GetAI_boss_kalec(Creature *_Creature) +CreatureAI* GetAI_boss_kalec(Creature* pCreature) { - return new boss_kalecAI (_Creature); + return new boss_kalecAI (pCreature); } void AddSC_boss_kalecgos() diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp index 6be1e0c36ad..6da1ccd9e24 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp @@ -410,9 +410,9 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_kalecgos_kj(Creature *_Creature) +CreatureAI* GetAI_boss_kalecgos_kj(Creature* pCreature) { - return new boss_kalecgos_kjAI (_Creature); + return new boss_kalecgos_kjAI (pCreature); } //AI for Kil'jaeden @@ -725,9 +725,9 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_boss_kiljaeden(Creature *_Creature) +CreatureAI* GetAI_boss_kiljaeden(Creature* pCreature) { - return new boss_kiljaedenAI (_Creature); + return new boss_kiljaedenAI (pCreature); } //AI for Kil'jaeden Event Controller @@ -814,9 +814,9 @@ struct TRINITY_DLL_DECL mob_kiljaeden_controllerAI : public Scripted_NoMovementA } }; -CreatureAI* GetAI_mob_kiljaeden_controller(Creature *_Creature) +CreatureAI* GetAI_mob_kiljaeden_controller(Creature* pCreature) { - return new mob_kiljaeden_controllerAI (_Creature); + return new mob_kiljaeden_controllerAI (pCreature); } //AI for Hand of the Deceiver @@ -898,9 +898,9 @@ struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_hand_of_the_deceiver(Creature *_Creature) +CreatureAI* GetAI_mob_hand_of_the_deceiver(Creature* pCreature) { - return new mob_hand_of_the_deceiverAI (_Creature); + return new mob_hand_of_the_deceiverAI (pCreature); } //AI for Felfire Portal @@ -942,9 +942,9 @@ struct TRINITY_DLL_DECL mob_felfire_portalAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_mob_felfire_portal(Creature *_Creature) +CreatureAI* GetAI_mob_felfire_portal(Creature* pCreature) { - return new mob_felfire_portalAI (_Creature); + return new mob_felfire_portalAI (pCreature); } //AI for Felfire Fiend @@ -991,9 +991,9 @@ struct TRINITY_DLL_DECL mob_volatile_felfire_fiendAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_volatile_felfire_fiend(Creature *_Creature) +CreatureAI* GetAI_mob_volatile_felfire_fiend(Creature* pCreature) { - return new mob_volatile_felfire_fiendAI (_Creature); + return new mob_volatile_felfire_fiendAI (pCreature); } //AI for Armageddon target @@ -1036,9 +1036,9 @@ struct TRINITY_DLL_DECL mob_armageddonAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_mob_armageddon(Creature *_Creature) +CreatureAI* GetAI_mob_armageddon(Creature* pCreature) { - return new mob_armageddonAI (_Creature); + return new mob_armageddonAI (pCreature); } //AI for Shield Orbs @@ -1107,9 +1107,9 @@ struct TRINITY_DLL_DECL mob_shield_orbAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_shield_orb(Creature *_Creature) +CreatureAI* GetAI_mob_shield_orb(Creature* pCreature) { - return new mob_shield_orbAI (_Creature); + return new mob_shield_orbAI (pCreature); } //AI for Sinister Reflection @@ -1250,9 +1250,9 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI }; -CreatureAI* GetAI_mob_sinster_reflection(Creature *_Creature) +CreatureAI* GetAI_mob_sinster_reflection(Creature* pCreature) { - return new mob_sinster_reflectionAI (_Creature); + return new mob_sinster_reflectionAI (pCreature); } void AddSC_boss_kiljaeden() diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp index ee995972ee5..003080002d1 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp @@ -201,9 +201,9 @@ struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_entropius(Creature *_Creature) +CreatureAI* GetAI_boss_entropius(Creature* pCreature) { - return new boss_entropiusAI (_Creature); + return new boss_entropiusAI (pCreature); } struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI @@ -358,9 +358,9 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_boss_muru(Creature *_Creature) +CreatureAI* GetAI_boss_muru(Creature* pCreature) { - return new boss_muruAI (_Creature); + return new boss_muruAI (pCreature); } struct TRINITY_DLL_DECL npc_muru_portalAI : public Scripted_NoMovementAI @@ -435,9 +435,9 @@ struct TRINITY_DLL_DECL npc_muru_portalAI : public Scripted_NoMovementAI } }; -CreatureAI* GetAI_npc_muru_portal(Creature *_Creature) +CreatureAI* GetAI_npc_muru_portal(Creature* pCreature) { - return new npc_muru_portalAI (_Creature); + return new npc_muru_portalAI (pCreature); } struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI @@ -500,9 +500,9 @@ struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_dark_fiend(Creature *_Creature) +CreatureAI* GetAI_npc_dark_fiend(Creature* pCreature) { - return new npc_dark_fiendAI (_Creature); + return new npc_dark_fiendAI (pCreature); } struct TRINITY_DLL_DECL npc_void_sentinelAI : public ScriptedAI @@ -555,9 +555,9 @@ struct TRINITY_DLL_DECL npc_void_sentinelAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_void_sentinel(Creature *_Creature) +CreatureAI* GetAI_npc_void_sentinel(Creature* pCreature) { - return new npc_void_sentinelAI (_Creature); + return new npc_void_sentinelAI (pCreature); } struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI @@ -628,9 +628,9 @@ struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_blackhole(Creature *_Creature) +CreatureAI* GetAI_npc_blackhole(Creature* pCreature) { - return new npc_blackholeAI (_Creature); + return new npc_blackholeAI (pCreature); } void AddSC_boss_muru() diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp index 30e62350c41..f41f10e37cc 100644 --- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp +++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp @@ -122,9 +122,9 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_mob_aquementas(Creature *_Creature) +CreatureAI* GetAI_mob_aquementas(Creature* pCreature) { - return new mob_aquementasAI (_Creature); + return new mob_aquementasAI (pCreature); } /*###### @@ -224,23 +224,23 @@ CreatureAI* GetAI_npc_custodian_of_time(Creature* pCreature) ## npc_marin_noggenfogger ######*/ -bool GossipHello_npc_marin_noggenfogger(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(2662)) + if (pCreature->isVendor() && pPlayer->GetQuestRewardStatus(2662)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -251,18 +251,18 @@ bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature *_Creature, u #define GOSSIP_ITEM_FLIGHT "Please take me to the master's lair." -bool GossipHello_npc_steward_of_time(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_steward_of_time(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(10279) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestRewardStatus(10279)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9978,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9978, pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(9977,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9977, pCreature->GetGUID()); return true; } @@ -275,7 +275,7 @@ bool QuestAccept_npc_steward_of_time(Player* pPlayer, Creature *creature, Quest return false; } -bool GossipSelect_npc_steward_of_time(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_steward_of_time(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) @@ -294,42 +294,42 @@ bool GossipSelect_npc_steward_of_time(Player* pPlayer, Creature *_Creature, uint #define GOSSIP_ITEM_NORGANNON_5 "So, what's inside Uldum?" #define GOSSIP_ITEM_NORGANNON_6 "I will return when i have the Plates of Uldum." -bool GossipHello_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(1674, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1674, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(1675, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1675, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(1676, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1676, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(1677, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1677, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(1678, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1678, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(1679, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1679, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->CLOSE_GOSSIP_MENU(); @@ -441,9 +441,9 @@ bool QuestAccept_npc_OOX17(Player* pPlayer, Creature* creature, Quest const* que return true; } -CreatureAI* GetAI_npc_OOX17(Creature *_Creature) +CreatureAI* GetAI_npc_OOX17(Creature* pCreature) { - npc_OOX17AI* OOX17AI = new npc_OOX17AI(_Creature); + npc_OOX17AI* OOX17AI = new npc_OOX17AI(pCreature); OOX17AI->AddWaypoint(0, -8843.73, -4374.44, 43.71); OOX17AI->AddWaypoint(1, -8834.68, -4373.88, 45.71); diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp index 128fb4aada6..fc855b74bd9 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp @@ -210,9 +210,9 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_millhouse_manastorm(Creature *_Creature) +CreatureAI* GetAI_npc_millhouse_manastorm(Creature* pCreature) { - return new npc_millhouse_manastormAI (_Creature); + return new npc_millhouse_manastormAI (pCreature); } /*##### @@ -468,9 +468,9 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI } else EventProgress_Timer -= diff; } }; -CreatureAI* GetAI_npc_warden_mellichar(Creature *_Creature) +CreatureAI* GetAI_npc_warden_mellichar(Creature* pCreature) { - return new npc_warden_mellicharAI (_Creature); + return new npc_warden_mellicharAI (pCreature); } /*##### @@ -494,9 +494,9 @@ struct TRINITY_DLL_DECL mob_zerekethvoidzoneAI : public ScriptedAI void EnterCombat(Unit* who) {} }; -CreatureAI* GetAI_mob_zerekethvoidzoneAI(Creature *_Creature) +CreatureAI* GetAI_mob_zerekethvoidzoneAI(Creature* pCreature) { - return new mob_zerekethvoidzoneAI (_Creature); + return new mob_zerekethvoidzoneAI (pCreature); } void AddSC_arcatraz() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index 7d388f18284..bcab1a6257f 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -266,9 +266,9 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_harbinger_skyriss(Creature *_Creature) +CreatureAI* GetAI_boss_harbinger_skyriss(Creature* pCreature) { - return new boss_harbinger_skyrissAI (_Creature); + return new boss_harbinger_skyrissAI (pCreature); } #define SPELL_MIND_REND_IMAGE 36929 @@ -290,9 +290,9 @@ struct TRINITY_DLL_DECL boss_harbinger_skyriss_illusionAI : public ScriptedAI void EnterCombat(Unit *who) { } }; -CreatureAI* GetAI_boss_harbinger_skyriss_illusion(Creature *_Creature) +CreatureAI* GetAI_boss_harbinger_skyriss_illusion(Creature* pCreature) { - return new boss_harbinger_skyriss_illusionAI (_Creature); + return new boss_harbinger_skyriss_illusionAI (pCreature); } void AddSC_boss_harbinger_skyriss() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp index 50a8a66bce8..c63fb1b8d58 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp @@ -182,9 +182,9 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_high_botanist_freywinn(Creature *_Creature) +CreatureAI* GetAI_boss_high_botanist_freywinn(Creature* pCreature) { - return new boss_high_botanist_freywinnAI (_Creature); + return new boss_high_botanist_freywinnAI (pCreature); } void AddSC_boss_high_botanist_freywinn() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp index 6478d5aaec9..ddd5745f93c 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp @@ -188,9 +188,9 @@ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_laj(Creature *_Creature) +CreatureAI* GetAI_boss_laj(Creature* pCreature) { - return new boss_lajAI (_Creature); + return new boss_lajAI (pCreature); } void AddSC_boss_laj() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp index 083d596fd42..a9b111be839 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp @@ -199,14 +199,14 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_warp_splinter(Creature *_Creature) +CreatureAI* GetAI_boss_warp_splinter(Creature* pCreature) { - return new boss_warp_splinterAI (_Creature); + return new boss_warp_splinterAI (pCreature); } -CreatureAI* GetAI_mob_treant(Creature *_Creature) +CreatureAI* GetAI_mob_treant(Creature* pCreature) { - return new mob_treantAI (_Creature); + return new mob_treantAI (pCreature); } void AddSC_boss_warp_splinter() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp index 5972364350b..e57f3294a55 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp @@ -423,9 +423,9 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_alar(Creature *_Creature) +CreatureAI* GetAI_boss_alar(Creature* pCreature) { - return new boss_alarAI(_Creature); + return new boss_alarAI(pCreature); } struct TRINITY_DLL_DECL mob_ember_of_alarAI : public ScriptedAI @@ -483,9 +483,9 @@ struct TRINITY_DLL_DECL mob_ember_of_alarAI : public ScriptedAI }; -CreatureAI* GetAI_mob_ember_of_alar(Creature *_Creature) +CreatureAI* GetAI_mob_ember_of_alar(Creature* pCreature) { - return new mob_ember_of_alarAI(_Creature); + return new mob_ember_of_alarAI(pCreature); } struct TRINITY_DLL_DECL mob_flame_patch_alarAI : public ScriptedAI @@ -498,9 +498,9 @@ struct TRINITY_DLL_DECL mob_flame_patch_alarAI : public ScriptedAI void UpdateAI(const uint32 diff) {} }; -CreatureAI* GetAI_mob_flame_patch_alar(Creature *_Creature) +CreatureAI* GetAI_mob_flame_patch_alar(Creature* pCreature) { - return new mob_flame_patch_alarAI(_Creature); + return new mob_flame_patch_alarAI(pCreature); } void AddSC_boss_alar() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp index aacdcb70087..81f3c619bac 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp @@ -448,14 +448,14 @@ struct TRINITY_DLL_DECL mob_solarium_priestAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_solarium_priest(Creature *_Creature) +CreatureAI* GetAI_mob_solarium_priest(Creature* pCreature) { - return new mob_solarium_priestAI (_Creature); + return new mob_solarium_priestAI (pCreature); } -CreatureAI* GetAI_boss_high_astromancer_solarian(Creature *_Creature) +CreatureAI* GetAI_boss_high_astromancer_solarian(Creature* pCreature) { - return new boss_high_astromancer_solarianAI (_Creature); + return new boss_high_astromancer_solarianAI (pCreature); } void AddSC_boss_high_astromancer_solarian() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp index 13011bf7672..60cfaf1609d 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp @@ -169,9 +169,9 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_void_reaver(Creature *_Creature) +CreatureAI* GetAI_boss_void_reaver(Creature* pCreature) { - return new boss_void_reaverAI (_Creature); + return new boss_void_reaverAI (pCreature); } void AddSC_boss_void_reaver() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp index 89d5e04e0c3..2dfff45796f 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp @@ -83,9 +83,9 @@ struct TRINITY_DLL_DECL mob_crystalcore_devastatorAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_crystalcore_devastator(Creature *_Creature) +CreatureAI* GetAI_mob_crystalcore_devastator(Creature* pCreature) { - return new mob_crystalcore_devastatorAI (_Creature); + return new mob_crystalcore_devastatorAI (pCreature); } void AddSC_the_eye() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index 0cf89e994da..a1ca31c3e5e 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -132,9 +132,9 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_gatewatcher_iron_hand(Creature *_Creature) +CreatureAI* GetAI_boss_gatewatcher_iron_hand(Creature* pCreature) { - return new boss_gatewatcher_iron_handAI (_Creature); + return new boss_gatewatcher_iron_handAI (pCreature); } void AddSC_boss_gatewatcher_iron_hand() diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index 6bbff63e6a4..da6c613d794 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -153,9 +153,9 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_nethermancer_sepethrea(Creature *_Creature) +CreatureAI* GetAI_boss_nethermancer_sepethrea(Creature* pCreature) { - return new boss_nethermancer_sepethreaAI (_Creature); + return new boss_nethermancer_sepethreaAI (pCreature); } #define SPELL_INFERNO 35268 @@ -238,9 +238,9 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_ragin_flames(Creature *_Creature) +CreatureAI* GetAI_mob_ragin_flames(Creature* pCreature) { - return new mob_ragin_flamesAI (_Creature); + return new mob_ragin_flamesAI (pCreature); } void AddSC_boss_nethermancer_sepethrea() { diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index 0ffb5fa511e..1e06232c9b6 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -170,9 +170,9 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature *_Creature) +CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature* pCreature) { - return new boss_pathaleon_the_calculatorAI (_Creature); + return new boss_pathaleon_the_calculatorAI (pCreature); } struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI @@ -236,9 +236,9 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_nether_wraith(Creature *_Creature) +CreatureAI* GetAI_mob_nether_wraith(Creature* pCreature) { - return new mob_nether_wraithAI (_Creature); + return new mob_nether_wraithAI (pCreature); } void AddSC_boss_pathaleon_the_calculator() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp index 14cf0226b8d..042dd5d53f5 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -310,19 +310,19 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_yauj(Creature *_Creature) +CreatureAI* GetAI_boss_yauj(Creature* pCreature) { - return new boss_yaujAI (_Creature); + return new boss_yaujAI (pCreature); } -CreatureAI* GetAI_boss_vem(Creature *_Creature) +CreatureAI* GetAI_boss_vem(Creature* pCreature) { - return new boss_vemAI (_Creature); + return new boss_vemAI (pCreature); } -CreatureAI* GetAI_boss_kri(Creature *_Creature) +CreatureAI* GetAI_boss_kri(Creature* pCreature) { - return new boss_kriAI (_Creature); + return new boss_kriAI (pCreature); } void AddSC_bug_trio() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp index e3f67e7ba00..905f46070f7 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp @@ -1257,39 +1257,39 @@ void flesh_tentacleAI::JustDied(Unit* killer) } //GetAIs -CreatureAI* GetAI_eye_of_cthun(Creature *_Creature) +CreatureAI* GetAI_eye_of_cthun(Creature* pCreature) { - return new eye_of_cthunAI (_Creature); + return new eye_of_cthunAI (pCreature); } -CreatureAI* GetAI_cthun(Creature *_Creature) +CreatureAI* GetAI_cthun(Creature* pCreature) { - return new cthunAI (_Creature); + return new cthunAI (pCreature); } -CreatureAI* GetAI_eye_tentacle(Creature *_Creature) +CreatureAI* GetAI_eye_tentacle(Creature* pCreature) { - return new eye_tentacleAI (_Creature); + return new eye_tentacleAI (pCreature); } -CreatureAI* GetAI_claw_tentacle(Creature *_Creature) +CreatureAI* GetAI_claw_tentacle(Creature* pCreature) { - return new claw_tentacleAI (_Creature); + return new claw_tentacleAI (pCreature); } -CreatureAI* GetAI_giant_claw_tentacle(Creature *_Creature) +CreatureAI* GetAI_giant_claw_tentacle(Creature* pCreature) { - return new giant_claw_tentacleAI (_Creature); + return new giant_claw_tentacleAI (pCreature); } -CreatureAI* GetAI_giant_eye_tentacle(Creature *_Creature) +CreatureAI* GetAI_giant_eye_tentacle(Creature* pCreature) { - return new giant_eye_tentacleAI (_Creature); + return new giant_eye_tentacleAI (pCreature); } -CreatureAI* GetAI_flesh_tentacle(Creature *_Creature) +CreatureAI* GetAI_flesh_tentacle(Creature* pCreature) { - return new flesh_tentacleAI (_Creature); + return new flesh_tentacleAI (pCreature); } void AddSC_boss_cthun() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp index b7827507d8e..6e5992556e3 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp @@ -190,9 +190,9 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_fankriss(Creature *_Creature) +CreatureAI* GetAI_boss_fankriss(Creature* pCreature) { - return new boss_fankrissAI (_Creature); + return new boss_fankrissAI (pCreature); } void AddSC_boss_fankriss() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp index 6eac0f176b3..705e2275d33 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp @@ -132,9 +132,9 @@ struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_huhuran(Creature *_Creature) +CreatureAI* GetAI_boss_huhuran(Creature* pCreature) { - return new boss_huhuranAI (_Creature); + return new boss_huhuranAI (pCreature); } void AddSC_boss_huhuran() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp index 98e50dbb94f..d7f6a186316 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp @@ -124,9 +124,9 @@ struct TRINITY_DLL_DECL boss_ouroAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_ouro(Creature *_Creature) +CreatureAI* GetAI_boss_ouro(Creature* pCreature) { - return new boss_ouroAI (_Creature); + return new boss_ouroAI (pCreature); } void AddSC_boss_ouro() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp index 21e73e8df4e..dd5aa9bae87 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp @@ -272,14 +272,14 @@ struct TRINITY_DLL_DECL mob_sartura_royal_guardAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_sartura(Creature *_Creature) +CreatureAI* GetAI_boss_sartura(Creature* pCreature) { - return new boss_sarturaAI (_Creature); + return new boss_sarturaAI (pCreature); } -CreatureAI* GetAI_mob_sartura_royal_guard(Creature *_Creature) +CreatureAI* GetAI_mob_sartura_royal_guard(Creature* pCreature) { - return new mob_sartura_royal_guardAI (_Creature); + return new mob_sartura_royal_guardAI (pCreature); } void AddSC_boss_sartura() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp index f17cbc7a231..df42bbb561d 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp @@ -300,9 +300,9 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI }; -CreatureAI* GetAI_boss_skeram(Creature *_Creature) +CreatureAI* GetAI_boss_skeram(Creature* pCreature) { - return new boss_skeramAI (_Creature); + return new boss_skeramAI (pCreature); } void AddSC_boss_skeram() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp index c6f27cf706e..fdc1b6ae408 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -591,14 +591,14 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI } }; -CreatureAI* GetAI_boss_veknilash(Creature *_Creature) +CreatureAI* GetAI_boss_veknilash(Creature* pCreature) { - return new boss_veknilashAI (_Creature); + return new boss_veknilashAI (pCreature); } -CreatureAI* GetAI_boss_veklor(Creature *_Creature) +CreatureAI* GetAI_boss_veklor(Creature* pCreature) { - return new boss_veklorAI (_Creature); + return new boss_veklorAI (pCreature); } void AddSC_boss_twinemperors() diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index 8237a0babdc..d176e0230a0 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -272,9 +272,9 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI return NULL; } }; -CreatureAI* GetAI_mob_anubisath_sentinelAI(Creature *_Creature) +CreatureAI* GetAI_mob_anubisath_sentinelAI(Creature* pCreature) { - return new aqsentinelAI (_Creature); + return new aqsentinelAI (pCreature); } void AddSC_mob_anubisath_sentinel() diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp index 63003ab47c9..5616ecfcd88 100644 --- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp @@ -138,9 +138,9 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_unkor_the_ruthless(Creature *_Creature) +CreatureAI* GetAI_mob_unkor_the_ruthless(Creature* pCreature) { - return new mob_unkor_the_ruthlessAI (_Creature); + return new mob_unkor_the_ruthlessAI (pCreature); } /*###### @@ -163,9 +163,9 @@ struct TRINITY_DLL_DECL mob_infested_root_walkerAI : public ScriptedAI m_creature->CastSpell(m_creature,39130,true); } }; -CreatureAI* GetAI_mob_infested_root_walker(Creature *_Creature) +CreatureAI* GetAI_mob_infested_root_walker(Creature* pCreature) { - return new mob_infested_root_walkerAI (_Creature); + return new mob_infested_root_walkerAI (pCreature); } @@ -219,9 +219,9 @@ public: } }; -CreatureAI* GetAI_npc_skywingAI(Creature *_Creature) +CreatureAI* GetAI_npc_skywingAI(Creature* pCreature) { - npc_skywingAI* skywingAI = new npc_skywingAI(_Creature); + npc_skywingAI* skywingAI = new npc_skywingAI(pCreature); skywingAI->FillPointMovementListForCreature(); @@ -248,9 +248,9 @@ struct TRINITY_DLL_DECL mob_rotting_forest_ragerAI : public ScriptedAI m_creature->CastSpell(m_creature,39134,true); } }; -CreatureAI* GetAI_mob_rotting_forest_rager(Creature *_Creature) +CreatureAI* GetAI_mob_rotting_forest_rager(Creature* pCreature) { - return new mob_rotting_forest_ragerAI (_Creature); + return new mob_rotting_forest_ragerAI (pCreature); } /*###### @@ -293,9 +293,9 @@ struct TRINITY_DLL_DECL mob_netherweb_victimAI : public ScriptedAI } } }; -CreatureAI* GetAI_mob_netherweb_victim(Creature *_Creature) +CreatureAI* GetAI_mob_netherweb_victim(Creature* pCreature) { - return new mob_netherweb_victimAI (_Creature); + return new mob_netherweb_victimAI (pCreature); } /*###### @@ -367,33 +367,33 @@ struct TRINITY_DLL_DECL npc_floonAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_floon(Creature *_Creature) +CreatureAI* GetAI_npc_floon(Creature* pCreature) { - return new npc_floonAI (_Creature); + return new npc_floonAI (pCreature); } -bool GossipHello_npc_floon(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_floon(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9442, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9442, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_floon(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_floon(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9443, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9443, pCreature->GetGUID()); } if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->setFaction(FACTION_HOSTILE_FL); - DoScriptText(SAY_FLOON_ATTACK, _Creature, pPlayer); - _Creature->AI()->AttackStart(pPlayer); + pCreature->setFaction(FACTION_HOSTILE_FL); + DoScriptText(SAY_FLOON_ATTACK, pCreature, pPlayer); + pCreature->AI()->AttackStart(pPlayer); } return true; } @@ -490,9 +490,9 @@ bool QuestAccept_npc_isla_starmane(Player* pPlayer, Creature* creature, Quest co return true; } -CreatureAI* GetAI_npc_isla_starmaneAI(Creature *_Creature) +CreatureAI* GetAI_npc_isla_starmaneAI(Creature* pCreature) { - npc_isla_starmaneAI* thisAI = new npc_isla_starmaneAI(_Creature); + npc_isla_starmaneAI* thisAI = new npc_isla_starmaneAI(pCreature); thisAI->AddWaypoint(0, -2265.21, 3091.14, 13.91); thisAI->AddWaypoint(1, -2266.80, 3091.33, 13.82, 1000); diff --git a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp index 4bd2cfe78f3..440def5d5ac 100644 --- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp @@ -109,9 +109,9 @@ bool QuestAccept_npc_swiftmountain(Player* pPlayer, Creature* creature, Quest co return true; } -CreatureAI* GetAI_npc_swiftmountain(Creature *_Creature) +CreatureAI* GetAI_npc_swiftmountain(Creature* pCreature) { - npc_swiftmountainAI* thisAI = new npc_swiftmountainAI(_Creature); + npc_swiftmountainAI* thisAI = new npc_swiftmountainAI(pCreature); thisAI->AddWaypoint(0, -5156.69, -1220.49, 48.78, 5000); thisAI->AddWaypoint(1, -5157.12, -1220.13, 48.67); @@ -273,16 +273,16 @@ struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI } }; -bool GossipHello_npc_plucky(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_plucky(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(738, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(738, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_plucky(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_plucky(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(action) { @@ -294,9 +294,9 @@ bool GossipSelect_npc_plucky(Player* pPlayer, Creature *_Creature, uint32 sender return true; } -CreatureAI* GetAI_npc_plucky(Creature *_Creature) +CreatureAI* GetAI_npc_plucky(Creature* pCreature) { - return new npc_pluckyAI(_Creature); + return new npc_pluckyAI(pCreature); } /*##### diff --git a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp index cd0335f4df8..f612e163a79 100644 --- a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp +++ b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp @@ -96,30 +96,30 @@ struct TRINITY_DLL_DECL npc_cairne_bloodhoofAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_npc_cairne_bloodhoof(Creature *_Creature) +CreatureAI* GetAI_npc_cairne_bloodhoof(Creature* pCreature) { - return new npc_cairne_bloodhoofAI (_Creature); + return new npc_cairne_bloodhoofAI (pCreature); } -bool GossipHello_npc_cairne_bloodhoof(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_cairne_bloodhoof(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(925) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HCB, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); - pPlayer->SEND_GOSSIP_MENU(7013, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7013, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_cairne_bloodhoof(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_cairne_bloodhoof(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_SENDER_INFO) { pPlayer->CastSpell(pPlayer, 23123, false); - pPlayer->SEND_GOSSIP_MENU(7014, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(7014, pCreature->GetGUID()); } return true; } diff --git a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp index bc484f91818..baddef00944 100644 --- a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp @@ -127,9 +127,9 @@ struct TRINITY_DLL_DECL npc_calvin_montagueAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_npc_calvin_montague(Creature *_Creature) +CreatureAI* GetAI_npc_calvin_montague(Creature* pCreature) { - return new npc_calvin_montagueAI (_Creature); + return new npc_calvin_montagueAI (pCreature); } bool QuestAccept_npc_calvin_montague(Player* pPlayer, Creature* pCreature, Quest const* quest) diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp index 0bf25a257c2..c99ac3bc059 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp @@ -189,9 +189,9 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI }; -CreatureAI* GetAI_boss_archaedas(Creature *_Creature) +CreatureAI* GetAI_boss_archaedas(Creature* pCreature) { - return new boss_archaedasAI (_Creature); + return new boss_archaedasAI (pCreature); } /* ScriptData @@ -277,9 +277,9 @@ struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_archaedas_minions(Creature *_Creature) +CreatureAI* GetAI_mob_archaedas_minions(Creature* pCreature) { - return new mob_archaedas_minionsAI (_Creature); + return new mob_archaedas_minionsAI (pCreature); } /* ScriptData @@ -394,9 +394,9 @@ struct TRINITY_DLL_DECL mob_stonekeepersAI : public ScriptedAI }; -CreatureAI* GetAI_mob_stonekeepers(Creature *_Creature) +CreatureAI* GetAI_mob_stonekeepers(Creature* pCreature) { - return new mob_stonekeepersAI (_Creature); + return new mob_stonekeepersAI (pCreature); } /* ScriptData diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp index ccee1e68790..17e32e7178a 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp @@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_ironaya(Creature *_Creature) +CreatureAI* GetAI_boss_ironaya(Creature* pCreature) { - return new boss_ironayaAI (_Creature); + return new boss_ironayaAI (pCreature); } void AddSC_boss_ironaya() diff --git a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp index 5ff1d5439c8..2817c2e8a26 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp @@ -79,88 +79,88 @@ struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_jadespine_basilisk(Creature *_Creature) +CreatureAI* GetAI_mob_jadespine_basilisk(Creature* pCreature) { - return new mob_jadespine_basiliskAI (_Creature); + return new mob_jadespine_basiliskAI (pCreature); } /*###### ## npc_lore_keeper_of_norgannon ######*/ -bool GossipHello_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(2278) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Who are the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(1079, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1079, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a \"subterranean being matrix\"?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(1080, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1080, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What are the anomalies you speak of?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(1081, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1081, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a resilient foundation of construction?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(1082, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1082, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So... the Earthen were made out of stone?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(1083, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1083, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Anything else I should know about the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(1084, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1084, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I think I understand the Creators' design intent for the Earthen now. What are the Earthen's anomalies that you spoke of earlier?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - pPlayer->SEND_GOSSIP_MENU(1085, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1085, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What high-stress environments would cause the Earthen to destabilize?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8); - pPlayer->SEND_GOSSIP_MENU(1086, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1086, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+8: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What happens when the Earthen destabilize?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); - pPlayer->SEND_GOSSIP_MENU(1087, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1087, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+9: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Troggs?! Are the troggs you mention the same as the ones in the world today?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10); - pPlayer->SEND_GOSSIP_MENU(1088, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1088, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "You mentioned two results when the Earthen destabilize. What is the second?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+11); - pPlayer->SEND_GOSSIP_MENU(1089, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1089, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Dwarves!!! Now you're telling me that dwarves originally came from the Earthen?!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+12); - pPlayer->SEND_GOSSIP_MENU(1090, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1090, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+12: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "These dwarves are the same ones today, yes? Do the dwarves maintain any other links to the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+13); - pPlayer->SEND_GOSSIP_MENU(1091, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1091, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+13: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Who are the Creators?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+14); - pPlayer->SEND_GOSSIP_MENU(1092, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1092, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+14: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "This is a lot to think about.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+15); - pPlayer->SEND_GOSSIP_MENU(1093, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1093, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+15: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will access the discs now.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+16); - pPlayer->SEND_GOSSIP_MENU(1094, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1094, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+16: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp index 20b24f0640b..e7ec03124de 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp @@ -57,9 +57,9 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_krystallus(Creature *_Creature) +CreatureAI* GetAI_boss_krystallus(Creature* pCreature) { - return new boss_krystallusAI (_Creature); + return new boss_krystallusAI (pCreature); } void AddSC_boss_krystallus() diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp index 6ca5dd5c9d2..51e8f26f6a9 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp @@ -65,9 +65,9 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_maiden_of_grief(Creature *_Creature) +CreatureAI* GetAI_boss_maiden_of_grief(Creature* pCreature) { - return new boss_maiden_of_griefAI (_Creature); + return new boss_maiden_of_griefAI (pCreature); } void AddSC_boss_maiden_of_grief() diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp index c7745f6713e..d0b0889ea63 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp @@ -67,9 +67,9 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_sjonnir(Creature *_Creature) +CreatureAI* GetAI_boss_sjonnir(Creature* pCreature) { - return new boss_sjonnirAI (_Creature); + return new boss_sjonnirAI (pCreature); } void AddSC_boss_sjonnir() diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp index 62cef5ee5a1..685e2b506c0 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp @@ -76,9 +76,9 @@ struct TRINITY_DLL_DECL boss_auriaya_AI : public ScriptedAI } }; -CreatureAI* GetAI_boss_auriaya(Creature *_Creature) +CreatureAI* GetAI_boss_auriaya(Creature* pCreature) { - return new boss_auriaya_AI (_Creature); + return new boss_auriaya_AI (pCreature); } void AddSC_boss_auriaya() { diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp index 4680f71c626..20ad85351a9 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp @@ -251,29 +251,29 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_overload_deviceAI : public Scripted } }; -CreatureAI* GetAI_boss_flame_leviathan(Creature *_Creature) +CreatureAI* GetAI_boss_flame_leviathan(Creature* pCreature) { - return new boss_flame_leviathanAI (_Creature); + return new boss_flame_leviathanAI (pCreature); } -CreatureAI* GetAI_boss_flame_leviathan_turret(Creature *_Creature) +CreatureAI* GetAI_boss_flame_leviathan_turret(Creature* pCreature) { - return new boss_flame_leviathan_turretAI (_Creature); + return new boss_flame_leviathan_turretAI (pCreature); } -CreatureAI* GetAI_boss_flame_leviathan_seat(Creature *_Creature) +CreatureAI* GetAI_boss_flame_leviathan_seat(Creature* pCreature) { - return new boss_flame_leviathan_seatAI (_Creature); + return new boss_flame_leviathan_seatAI (pCreature); } -CreatureAI* GetAI_boss_flame_leviathan_defense_turret(Creature *_Creature) +CreatureAI* GetAI_boss_flame_leviathan_defense_turret(Creature* pCreature) { - return new boss_flame_leviathan_defense_turretAI (_Creature); + return new boss_flame_leviathan_defense_turretAI (pCreature); } -CreatureAI* GetAI_boss_flame_leviathan_overload_device(Creature *_Creature) +CreatureAI* GetAI_boss_flame_leviathan_overload_device(Creature* pCreature) { - return new boss_flame_leviathan_overload_deviceAI (_Creature); + return new boss_flame_leviathan_overload_deviceAI (pCreature); } void AddSC_boss_flame_leviathan() diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp index 657ce25ca3e..56405eb13e1 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp @@ -87,9 +87,9 @@ struct TRINITY_DLL_DECL boss_ignis_AI : public ScriptedAI } }; -CreatureAI* GetAI_boss_ignis(Creature *_Creature) +CreatureAI* GetAI_boss_ignis(Creature* pCreature) { - return new boss_ignis_AI (_Creature); + return new boss_ignis_AI (pCreature); } void AddSC_boss_ignis() { diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp index 272857fd850..59a7b8e6a9a 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp @@ -285,9 +285,9 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_razorscale(Creature *_Creature) +CreatureAI* GetAI_boss_razorscale(Creature* pCreature) { - return new boss_razorscaleAI (_Creature); + return new boss_razorscaleAI (pCreature); } void AddSC_boss_razorscale() diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp index 6003ef01721..a0d265f6224 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp @@ -75,9 +75,9 @@ struct TRINITY_DLL_DECL boss_xt002_AI : public ScriptedAI } }; -CreatureAI* GetAI_boss_xt002(Creature *_Creature) +CreatureAI* GetAI_boss_xt002(Creature* pCreature) { - return new boss_xt002_AI (_Creature); + return new boss_xt002_AI (pCreature); } void AddSC_boss_xt002() { diff --git a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp index 1ad4fd65f8f..d3faa7e0995 100644 --- a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp +++ b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp @@ -125,21 +125,21 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_npc_lady_sylvanas_windrunner(Creature *_Creature) +CreatureAI* GetAI_npc_lady_sylvanas_windrunner(Creature* pCreature) { - return new npc_lady_sylvanas_windrunnerAI (_Creature); + return new npc_lady_sylvanas_windrunnerAI (pCreature); } -bool ChooseReward_npc_lady_sylvanas_windrunner(Player* pPlayer, Creature *_Creature, const Quest *_Quest, uint32 slot) +bool ChooseReward_npc_lady_sylvanas_windrunner(Player* pPlayer, Creature* pCreature, const Quest *_Quest, uint32 slot) { if (_Quest->GetQuestId() == 9180) { - CAST_AI(npc_lady_sylvanas_windrunnerAI, _Creature->AI())->LamentEvent = true; - CAST_AI(npc_lady_sylvanas_windrunnerAI, _Creature->AI())->DoPlaySoundToSet(_Creature,SOUND_CREDIT); - _Creature->CastSpell(_Creature,SPELL_SYLVANAS_CAST,false); + CAST_AI(npc_lady_sylvanas_windrunnerAI, pCreature->AI())->LamentEvent = true; + CAST_AI(npc_lady_sylvanas_windrunnerAI, pCreature->AI())->DoPlaySoundToSet(pCreature,SOUND_CREDIT); + pCreature->CastSpell(pCreature,SPELL_SYLVANAS_CAST,false); for(uint8 i = 0; i < 4; ++i) - _Creature->SummonCreature(ENTRY_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000); + pCreature->SummonCreature(ENTRY_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000); } return true; @@ -190,9 +190,9 @@ struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI } } }; -CreatureAI* GetAI_npc_highborne_lamenter(Creature *_Creature) +CreatureAI* GetAI_npc_highborne_lamenter(Creature* pCreature) { - return new npc_highborne_lamenterAI (_Creature); + return new npc_highborne_lamenterAI (pCreature); } /*###### @@ -205,30 +205,30 @@ CreatureAI* GetAI_npc_highborne_lamenter(Creature *_Creature) #define GOSSIP_HPF2 "Kel'Thuzad" #define GOSSIP_HPF3 "Ner'zhul" -bool GossipHello_npc_parqual_fintallas(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_parqual_fintallas(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(6628) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasAura(SPELL_MARK_OF_SHAME)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(5822, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5822, pCreature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(5821, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5821, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_parqual_fintallas(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_parqual_fintallas(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer,SPELL_MARK_OF_SHAME,false); + pCreature->CastSpell(pPlayer,SPELL_MARK_OF_SHAME,false); } if (action == GOSSIP_ACTION_INFO_DEF+2) { diff --git a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp index af9f2bdebf9..5fa2e26fc85 100644 --- a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp @@ -133,9 +133,9 @@ bool QuestAccept_npc_ame(Player* pPlayer, Creature* creature, Quest const* quest return true; } -CreatureAI* GetAI_npc_ame(Creature *_Creature) +CreatureAI* GetAI_npc_ame(Creature* pCreature) { - npc_ameAI* thisAI = new npc_ameAI(_Creature); + npc_ameAI* thisAI = new npc_ameAI(pCreature); thisAI->AddWaypoint(1, -6380.38, -1965.14, -258.292, 5000); thisAI->AddWaypoint(2, -6383.06, -1962.9, -258.936); diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 1c540256e50..a2445a97229 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -271,9 +271,9 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_ingvar_the_plunderer(Creature *_Creature) +CreatureAI* GetAI_boss_ingvar_the_plunderer(Creature* pCreature) { - return new boss_ingvar_the_plundererAI (_Creature); + return new boss_ingvar_the_plundererAI (pCreature); } enum @@ -383,9 +383,9 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_annhylde_the_caller(Creature *_Creature) +CreatureAI* GetAI_mob_annhylde_the_caller(Creature* pCreature) { - return new mob_annhylde_the_callerAI (_Creature); + return new mob_annhylde_the_callerAI (pCreature); } enum @@ -433,9 +433,9 @@ struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_ingvar_throw_dummy(Creature *_Creature) +CreatureAI* GetAI_mob_ingvar_throw_dummy(Creature* pCreature) { - return new mob_ingvar_throw_dummyAI (_Creature); + return new mob_ingvar_throw_dummyAI (pCreature); } void AddSC_boss_ingvar_the_plunderer() diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp index 878cc8c17b0..b7701a52472 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -329,19 +329,19 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_frost_tomb(Creature *_Creature) +CreatureAI* GetAI_mob_frost_tomb(Creature* pCreature) { - return new mob_frost_tombAI(_Creature); + return new mob_frost_tombAI(pCreature); } -CreatureAI* GetAI_boss_keleseth(Creature *_Creature) +CreatureAI* GetAI_boss_keleseth(Creature* pCreature) { - return new boss_kelesethAI (_Creature); + return new boss_kelesethAI (pCreature); } -CreatureAI* GetAI_mob_vrykul_skeleton(Creature *_Creature) +CreatureAI* GetAI_mob_vrykul_skeleton(Creature* pCreature) { - return new mob_vrykul_skeletonAI (_Creature); + return new mob_vrykul_skeletonAI (pCreature); } void AddSC_boss_keleseth() diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index d01a86fb2b9..f1babbfb9c8 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -198,9 +198,9 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_skarvald_the_constructor(Creature *_Creature) +CreatureAI* GetAI_boss_skarvald_the_constructor(Creature* pCreature) { - return new boss_skarvald_the_constructorAI (_Creature); + return new boss_skarvald_the_constructorAI (pCreature); } struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI @@ -370,9 +370,9 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_dalronn_the_controller(Creature *_Creature) +CreatureAI* GetAI_boss_dalronn_the_controller(Creature* pCreature) { - return new boss_dalronn_the_controllerAI (_Creature); + return new boss_dalronn_the_controllerAI (pCreature); } void AddSC_boss_skarvald_dalronn() diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp index 4c293261242..d82e45f28d4 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp @@ -144,9 +144,9 @@ struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_dragonflayer_forge_master(Creature *_Creature) +CreatureAI* GetAI_npc_dragonflayer_forge_master(Creature* pCreature) { - return new npc_dragonflayer_forge_masterAI(_Creature); + return new npc_dragonflayer_forge_masterAI(pCreature); } void AddSC_utgarde_keep() diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index ab713d48c49..503cae94f4d 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -62,9 +62,9 @@ struct TRINITY_DLL_DECL boss_palehoofAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_palehoof(Creature *_Creature) +CreatureAI* GetAI_boss_palehoof(Creature* pCreature) { - return new boss_palehoofAI (_Creature); + return new boss_palehoofAI (pCreature); } void AddSC_boss_palehoof() diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp index 6350898b452..f21ae75318a 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp @@ -73,9 +73,9 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_skadi(Creature *_Creature) +CreatureAI* GetAI_boss_skadi(Creature* pCreature) { - return new boss_skadiAI (_Creature); + return new boss_skadiAI (pCreature); } void AddSC_boss_skadi() diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp index ea0c9971220..e43d0cd9d4d 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp @@ -67,9 +67,9 @@ struct TRINITY_DLL_DECL boss_svalaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_svala(Creature *_Creature) +CreatureAI* GetAI_boss_svala(Creature* pCreature) { - return new boss_svalaAI (_Creature); + return new boss_svalaAI (pCreature); } void AddSC_boss_svala() diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp index 4dbc441db2b..43a16a78db4 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp @@ -69,9 +69,9 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_ymiron(Creature *_Creature) +CreatureAI* GetAI_boss_ymiron(Creature* pCreature) { - return new boss_ymironAI (_Creature); + return new boss_ymironAI (pCreature); } void AddSC_boss_ymiron() diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp index afa264afdc3..2a0e7fcd007 100644 --- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp +++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp @@ -173,14 +173,14 @@ struct TRINITY_DLL_DECL mob_warderAI : public ScriptedAI //npc 32353 } }; -CreatureAI* GetAI_mob_warder(Creature *_Creature) +CreatureAI* GetAI_mob_warder(Creature* pCreature) { - return new mob_warderAI (_Creature); + return new mob_warderAI (pCreature); } -CreatureAI* GetAI_boss_archavon(Creature *_Creature) +CreatureAI* GetAI_boss_archavon(Creature* pCreature) { - return new boss_archavonAI (_Creature); + return new boss_archavonAI (pCreature); } void AddSC_boss_archavon() diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp index 8055abcb2c0..7738b790abf 100644 --- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp +++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp @@ -256,14 +256,14 @@ struct TRINITY_DLL_DECL mob_tempest_minionAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_tempest_minion(Creature *_Creature) +CreatureAI* GetAI_mob_tempest_minion(Creature* pCreature) { - return new mob_tempest_minionAI (_Creature); + return new mob_tempest_minionAI (pCreature); } -CreatureAI* GetAI_boss_emalon(Creature *_Creature) +CreatureAI* GetAI_boss_emalon(Creature* pCreature) { - return new boss_emalonAI (_Creature); + return new boss_emalonAI (pCreature); } void AddSC_boss_emalon() diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp index 2c64b1be892..13ad8c27a75 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp @@ -66,9 +66,9 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_cyanigosa(Creature *_Creature) +CreatureAI* GetAI_boss_cyanigosa(Creature* pCreature) { - return new boss_cyanigosaAI (_Creature); + return new boss_cyanigosaAI (pCreature); } void AddSC_boss_cyanigosa() diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp index 70f50cbdcb1..d5f18ac806f 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp @@ -66,9 +66,9 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_erekem(Creature *_Creature) +CreatureAI* GetAI_boss_erekem(Creature* pCreature) { - return new boss_erekemAI (_Creature); + return new boss_erekemAI (pCreature); } void AddSC_boss_erekem() diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp index 5d355a905ee..60b1c656808 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp @@ -65,9 +65,9 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_ichoron(Creature *_Creature) +CreatureAI* GetAI_boss_ichoron(Creature* pCreature) { - return new boss_ichoronAI (_Creature); + return new boss_ichoronAI (pCreature); } void AddSC_boss_ichoron() diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp index ce1a7dd4e0d..430a8acb178 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp @@ -36,9 +36,9 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI void JustDied(Unit* killer) {} }; -CreatureAI* GetAI_boss_lavanthor(Creature *_Creature) +CreatureAI* GetAI_boss_lavanthor(Creature* pCreature) { - return new boss_lavanthorAI (_Creature); + return new boss_lavanthorAI (pCreature); } void AddSC_boss_lavanthor() diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp index 178352de109..fdc18a3c549 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp @@ -34,9 +34,9 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI void JustDied(Unit* killer) {} }; -CreatureAI* GetAI_boss_moragg(Creature *_Creature) +CreatureAI* GetAI_boss_moragg(Creature* pCreature) { - return new boss_moraggAI (_Creature); + return new boss_moraggAI (pCreature); } void AddSC_boss_moragg() diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp index e327b10ed12..b59c4aec4e1 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp @@ -66,9 +66,9 @@ struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_xevozz(Creature *_Creature) +CreatureAI* GetAI_boss_xevozz(Creature* pCreature) { - return new boss_xevozzAI (_Creature); + return new boss_xevozzAI (pCreature); } void AddSC_boss_xevozz() diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp index 7b31f5b899d..218b5915bec 100644 --- a/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp +++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp @@ -66,9 +66,9 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_zuramat(Creature *_Creature) +CreatureAI* GetAI_boss_zuramat(Creature* pCreature) { - return new boss_zuramatAI (_Creature); + return new boss_zuramatAI (pCreature); } void AddSC_boss_zuramat() diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp index 6d47f293c13..f1aa7795e86 100644 --- a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp +++ b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp @@ -346,58 +346,58 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI } }; -CreatureAI* GetAI_npc_disciple_of_naralex(Creature *_Creature) +CreatureAI* GetAI_npc_disciple_of_naralex(Creature* pCreature) { - npc_disciple_of_naralexAI *disciple_of_naralexAI = new npc_disciple_of_naralexAI(_Creature); + npc_disciple_of_naralexAI *disciple_of_naralexAI = new npc_disciple_of_naralexAI(pCreature); disciple_of_naralexAI->FillPointMovementListForCreature(); return disciple_of_naralexAI; } -bool GossipHello_npc_disciple_of_naralex(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature) { - ScriptedInstance *pInstance = (_Creature->GetInstanceData()); + ScriptedInstance *pInstance = (pCreature->GetInstanceData()); if (pInstance) { - _Creature->CastSpell(pPlayer, SPELL_MARK_OF_THE_WILD_RANK_2, true); + pCreature->CastSpell(pPlayer, SPELL_MARK_OF_THE_WILD_RANK_2, true); if ((pInstance->GetData(TYPE_LORD_COBRAHN) == DONE) && (pInstance->GetData(TYPE_LORD_PYTHAS) == DONE) && (pInstance->GetData(TYPE_LADY_ANACONDRA) == DONE) && (pInstance->GetData(TYPE_LORD_SERPENTIS) == DONE)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NARALEX, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, pCreature->GetGUID()); if (!pInstance->GetData(TYPE_NARALEX_YELLED)) { - DoScriptText(SAY_AT_LAST, _Creature); + DoScriptText(SAY_AT_LAST, pCreature); pInstance->SetData(TYPE_NARALEX_YELLED, 1); } } else { - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_1, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_1, pCreature->GetGUID()); } } return true; } -bool GossipSelect_npc_disciple_of_naralex(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { - ScriptedInstance *pInstance = (_Creature->GetInstanceData()); + ScriptedInstance *pInstance = (pCreature->GetInstanceData()); if (action == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance)pInstance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS); - DoScriptText(SAY_MAKE_PREPARATIONS, _Creature); + DoScriptText(SAY_MAKE_PREPARATIONS, pCreature); - _Creature->setFaction(250); - _Creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); + pCreature->setFaction(250); + pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); - CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, pPlayer->GetGUID()); - CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtFar(false); - CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtEnd(false); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (pCreature->AI()))->SetDespawnAtFar(false); + CAST_AI(npc_escortAI, (pCreature->AI()))->SetDespawnAtEnd(false); } return true; } diff --git a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp index 2abae29ccde..abf5f78b060 100644 --- a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp @@ -40,11 +40,11 @@ EndContentData */ #define GOSSIP_SDA1 "Thanks, i need a Vitreous Focuser" -bool GossipHello_npcs_dithers_and_arbington(Player* pPlayer, Creature *_Creature) +bool GossipHello_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); - if (_Creature->isVendor()) + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + if (pCreature->isVendor()) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); if (pPlayer->GetQuestRewardStatus(5237) || pPlayer->GetQuestRewardStatus(5238)) @@ -53,39 +53,39 @@ bool GossipHello_npcs_dithers_and_arbington(Player* pPlayer, Creature *_Creature pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(3985, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3985, pCreature->GetGUID()); }else - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npcs_dithers_and_arbington(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch(action) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(3980, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3980, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(3981, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3981, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(3982, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3982, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(3983, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3983, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer, 17529, false); + pCreature->CastSpell(pPlayer, 17529, false); break; } return true; @@ -199,9 +199,9 @@ struct TRINITY_DLL_DECL npc_the_scourge_cauldronAI : public ScriptedAI } } }; -CreatureAI* GetAI_npc_the_scourge_cauldron(Creature *_Creature) +CreatureAI* GetAI_npc_the_scourge_cauldron(Creature* pCreature) { - return new npc_the_scourge_cauldronAI (_Creature); + return new npc_the_scourge_cauldronAI (pCreature); } /*###### diff --git a/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp b/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp index 9eac05acc30..275043d91e5 100644 --- a/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp +++ b/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp @@ -17,10 +17,10 @@ #include "precompiled.h" #include "Wintergrasp.h" -bool GossipHello_npc_demolisher_engineerer(Player* pPlayer, Creature *_creature) +bool GossipHello_npc_demolisher_engineerer(Player* pPlayer, Creature* pCreature) { - if (_creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->HasAura(SPELL_CORPORAL)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build catapult.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -31,7 +31,7 @@ bool GossipHello_npc_demolisher_engineerer(Player* pPlayer, Creature *_creature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build siege engine.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); } - pPlayer->SEND_GOSSIP_MENU(_creature->GetNpcTextId(), _creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } diff --git a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp index f1737eec360..714fa7311da 100644 --- a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp +++ b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp @@ -41,42 +41,42 @@ EndContentData */ #define GOSSIP_SL4 "Then what happened?" #define GOSSIP_SL5 "He is not safe, i'll make sure of that." -bool GossipHello_npc_lorax(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_lorax(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_lorax(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_lorax(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(3759, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3759, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(3760, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3760, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(3761, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3761, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(3762, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3762, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(3763, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3763, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->CLOSE_GOSSIP_MENU(); @@ -90,23 +90,23 @@ bool GossipSelect_npc_lorax(Player* pPlayer, Creature *_Creature, uint32 sender, ## npc_rivern_frostwind ######*/ -bool GossipHello_npc_rivern_frostwind(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_rivern_frostwind(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (_Creature->isVendor() && pPlayer->GetReputationRank(589) == REP_EXALTED) + if (pCreature->isVendor() && pPlayer->GetReputationRank(589) == REP_EXALTED) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_rivern_frostwind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_rivern_frostwind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -117,27 +117,27 @@ bool GossipSelect_npc_rivern_frostwind(Player* pPlayer, Creature *_Creature, uin #define GOSSIP_HWDM "I'd like you to make me a new Cache of Mau'ari please." -bool GossipHello_npc_witch_doctor_mauari(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature) { - if (_Creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(_Creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestRewardStatus(975)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(3377, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3377, pCreature->GetGUID()); }else - pPlayer->SEND_GOSSIP_MENU(3375, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(3375, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action==GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->CastSpell(pPlayer, 16351, false); + pCreature->CastSpell(pPlayer, 16351, false); } return true; diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp index a083226bbb4..5b473d25de5 100644 --- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp @@ -41,75 +41,75 @@ EndContentData */ #define GOSSIP_REWARD_BLESS -1000359 //#define TEXT_BLESSINGS "<You need higher standing with Cenarion Expedition to recive a blessing.>" -bool GossipHello_npcs_ashyen_and_keleth(Player* pPlayer, Creature *_Creature) +bool GossipHello_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetReputationRank(942) > REP_NEUTRAL) { - if (_Creature->GetEntry() == 17900) + if (pCreature->GetEntry() == 17900) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_ASH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - if (_Creature->GetEntry() == 17901) + if (pCreature->GetEntry() == 17901) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_KEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); } - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npcs_ashyen_and_keleth(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { - _Creature->setPowerType(POWER_MANA); - _Creature->SetMaxPower(POWER_MANA,200); //set a "fake" mana value, we can't depend on database doing it in this case - _Creature->SetPower(POWER_MANA,200); + pCreature->setPowerType(POWER_MANA); + pCreature->SetMaxPower(POWER_MANA,200); //set a "fake" mana value, we can't depend on database doing it in this case + pCreature->SetPower(POWER_MANA,200); - if (_Creature->GetEntry() == 17900) //check which creature we are dealing with + if (pCreature->GetEntry() == 17900) //check which creature we are dealing with { switch (pPlayer->GetReputationRank(942)) { //mark of lore case REP_FRIENDLY: - _Creature->CastSpell(pPlayer, 31808, true); - DoScriptText(GOSSIP_REWARD_BLESS, _Creature); + pCreature->CastSpell(pPlayer, 31808, true); + DoScriptText(GOSSIP_REWARD_BLESS, pCreature); break; case REP_HONORED: - _Creature->CastSpell(pPlayer, 31810, true); - DoScriptText(GOSSIP_REWARD_BLESS, _Creature); + pCreature->CastSpell(pPlayer, 31810, true); + DoScriptText(GOSSIP_REWARD_BLESS, pCreature); break; case REP_REVERED: - _Creature->CastSpell(pPlayer, 31811, true); - DoScriptText(GOSSIP_REWARD_BLESS, _Creature); + pCreature->CastSpell(pPlayer, 31811, true); + DoScriptText(GOSSIP_REWARD_BLESS, pCreature); break; case REP_EXALTED: - _Creature->CastSpell(pPlayer, 31815, true); - DoScriptText(GOSSIP_REWARD_BLESS, _Creature); + pCreature->CastSpell(pPlayer, 31815, true); + DoScriptText(GOSSIP_REWARD_BLESS, pCreature); break; } } - if (_Creature->GetEntry() == 17901) + if (pCreature->GetEntry() == 17901) { switch (pPlayer->GetReputationRank(942)) //mark of war { case REP_FRIENDLY: - _Creature->CastSpell(pPlayer, 31807, true); - DoScriptText(GOSSIP_REWARD_BLESS, _Creature); + pCreature->CastSpell(pPlayer, 31807, true); + DoScriptText(GOSSIP_REWARD_BLESS, pCreature); break; case REP_HONORED: - _Creature->CastSpell(pPlayer, 31812, true); - DoScriptText(GOSSIP_REWARD_BLESS, _Creature); + pCreature->CastSpell(pPlayer, 31812, true); + DoScriptText(GOSSIP_REWARD_BLESS, pCreature); break; case REP_REVERED: - _Creature->CastSpell(pPlayer, 31813, true); - DoScriptText(GOSSIP_REWARD_BLESS, _Creature); + pCreature->CastSpell(pPlayer, 31813, true); + DoScriptText(GOSSIP_REWARD_BLESS, pCreature); break; case REP_EXALTED: - _Creature->CastSpell(pPlayer, 31814, true); - DoScriptText(GOSSIP_REWARD_BLESS, _Creature); + pCreature->CastSpell(pPlayer, 31814, true); + DoScriptText(GOSSIP_REWARD_BLESS, pCreature); break; } } pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); + pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); } return true; } @@ -161,27 +161,27 @@ struct TRINITY_DLL_DECL npc_cooshcooshAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_cooshcoosh(Creature *_Creature) +CreatureAI* GetAI_npc_cooshcoosh(Creature* pCreature) { - return new npc_cooshcooshAI (_Creature); + return new npc_cooshcooshAI (pCreature); } -bool GossipHello_npc_cooshcoosh(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_cooshcoosh(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9441, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9441, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_cooshcoosh(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_cooshcoosh(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->setFaction(FACTION_HOSTILE_CO); - _Creature->AI()->AttackStart(pPlayer); + pCreature->setFaction(FACTION_HOSTILE_CO); + pCreature->AI()->AttackStart(pPlayer); } return true; } @@ -194,27 +194,27 @@ bool GossipSelect_npc_cooshcoosh(Player* pPlayer, Creature *_Creature, uint32 se #define GOSSIP_ITEM_KUR2 "Im a messenger for Draenei" #define GOSSIP_ITEM_KUR3 "Get message" -bool GossipHello_npc_elder_kuruti(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_elder_kuruti(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9226,_Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9226, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { switch (action) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9227, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9227, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9229, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9229, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: { @@ -229,7 +229,7 @@ bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature *_Creature, uint32 else pPlayer->SendEquipError(msg,NULL,NULL); } - pPlayer->SEND_GOSSIP_MENU(9231, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9231, pCreature->GetGUID()); break; } } @@ -240,21 +240,21 @@ bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature *_Creature, uint32 ## npc_mortog_steamhead ######*/ -bool GossipHello_npc_mortog_steamhead(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature) { - if (_Creature->isVendor() && pPlayer->GetReputationRank(942) == REP_EXALTED) + if (pCreature->isVendor() && pPlayer->GetReputationRank(942) == REP_EXALTED) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_TRADE) { - pPlayer->SEND_VENDORLIST(_Creature->GetGUID()); + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); } return true; } diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp index e597d93a1c7..153a329e265 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp @@ -429,14 +429,14 @@ struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI }; //Soaring Eagle -CreatureAI* GetAI_mob_soaring_eagle(Creature *_Creature) +CreatureAI* GetAI_mob_soaring_eagle(Creature* pCreature) { - return new mob_soaring_eagleAI(_Creature); + return new mob_soaring_eagleAI(pCreature); } -CreatureAI* GetAI_boss_akilzon(Creature *_Creature) +CreatureAI* GetAI_boss_akilzon(Creature* pCreature) { - return new boss_akilzonAI(_Creature); + return new boss_akilzonAI(pCreature); } void AddSC_boss_akilzon() diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp index 62cab9fbd79..99131484636 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp @@ -377,14 +377,14 @@ struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI }; -CreatureAI* GetAI_boss_halazziAI(Creature *_Creature) +CreatureAI* GetAI_boss_halazziAI(Creature* pCreature) { - return new boss_halazziAI (_Creature); + return new boss_halazziAI (pCreature); } -CreatureAI* GetAI_boss_spiritlynxAI(Creature *_Creature) +CreatureAI* GetAI_boss_spiritlynxAI(Creature* pCreature) { - return new boss_spiritlynxAI (_Creature); + return new boss_spiritlynxAI (pCreature); } void AddSC_boss_halazzi() diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp index 81aae062cb5..d34dccfd690 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp @@ -817,49 +817,49 @@ struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI } }; -CreatureAI* GetAI_boss_hex_lord_malacrass(Creature *_Creature) +CreatureAI* GetAI_boss_hex_lord_malacrass(Creature* pCreature) { - return new boss_hex_lord_malacrassAI (_Creature); + return new boss_hex_lord_malacrassAI (pCreature); } -CreatureAI* GetAI_boss_thurg(Creature *_Creature) +CreatureAI* GetAI_boss_thurg(Creature* pCreature) { - return new boss_thurgAI (_Creature); + return new boss_thurgAI (pCreature); } -CreatureAI* GetAI_boss_alyson_antille(Creature *_Creature) +CreatureAI* GetAI_boss_alyson_antille(Creature* pCreature) { - return new boss_alyson_antilleAI (_Creature); + return new boss_alyson_antilleAI (pCreature); } -CreatureAI* GetAI_boss_gazakroth(Creature *_Creature) +CreatureAI* GetAI_boss_gazakroth(Creature* pCreature) { - return new boss_gazakrothAI (_Creature); + return new boss_gazakrothAI (pCreature); } -CreatureAI* GetAI_boss_lord_raadan(Creature *_Creature) +CreatureAI* GetAI_boss_lord_raadan(Creature* pCreature) { - return new boss_lord_raadanAI (_Creature); + return new boss_lord_raadanAI (pCreature); } -CreatureAI* GetAI_boss_darkheart(Creature *_Creature) +CreatureAI* GetAI_boss_darkheart(Creature* pCreature) { - return new boss_darkheartAI (_Creature); + return new boss_darkheartAI (pCreature); } -CreatureAI* GetAI_boss_slither(Creature *_Creature) +CreatureAI* GetAI_boss_slither(Creature* pCreature) { - return new boss_slitherAI (_Creature); + return new boss_slitherAI (pCreature); } -CreatureAI* GetAI_boss_fenstalker(Creature *_Creature) +CreatureAI* GetAI_boss_fenstalker(Creature* pCreature) { - return new boss_fenstalkerAI (_Creature); + return new boss_fenstalkerAI (pCreature); } -CreatureAI* GetAI_boss_koragg(Creature *_Creature) +CreatureAI* GetAI_boss_koragg(Creature* pCreature) { - return new boss_koraggAI (_Creature); + return new boss_koraggAI (pCreature); } void AddSC_boss_hex_lord_malacrass() { diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp index 91d3153622e..6ff4d84ae67 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp @@ -437,9 +437,9 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_janalaiAI(Creature *_Creature) +CreatureAI* GetAI_boss_janalaiAI(Creature* pCreature) { - return new boss_janalaiAI(_Creature); + return new boss_janalaiAI(pCreature); } struct TRINITY_DLL_DECL mob_janalai_firebombAI : public ScriptedAI @@ -463,9 +463,9 @@ struct TRINITY_DLL_DECL mob_janalai_firebombAI : public ScriptedAI void UpdateAI(const uint32 diff) {} }; -CreatureAI* GetAI_mob_janalai_firebombAI(Creature *_Creature) +CreatureAI* GetAI_mob_janalai_firebombAI(Creature* pCreature) { - return new mob_janalai_firebombAI(_Creature); + return new mob_janalai_firebombAI(pCreature); } struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI @@ -594,9 +594,9 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_amanishi_hatcherAI(Creature *_Creature) +CreatureAI* GetAI_mob_amanishi_hatcherAI(Creature* pCreature) { - return new mob_amanishi_hatcherAI(_Creature); + return new mob_amanishi_hatcherAI(pCreature); } struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI @@ -644,9 +644,9 @@ struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_hatchlingAI(Creature *_Creature) +CreatureAI* GetAI_mob_hatchlingAI(Creature* pCreature) { - return new mob_hatchlingAI(_Creature); + return new mob_hatchlingAI(pCreature); } struct TRINITY_DLL_DECL mob_eggAI : public ScriptedAI @@ -668,9 +668,9 @@ struct TRINITY_DLL_DECL mob_eggAI : public ScriptedAI } }; -CreatureAI* GetAI_mob_eggAI(Creature *_Creature) +CreatureAI* GetAI_mob_eggAI(Creature* pCreature) { - return new mob_eggAI(_Creature); + return new mob_eggAI(pCreature); } void AddSC_boss_janalai() diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp index bfca36e39b9..f9e231948c4 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp @@ -437,9 +437,9 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_nalorakk(Creature *_Creature) +CreatureAI* GetAI_boss_nalorakk(Creature* pCreature) { - return new boss_nalorakkAI (_Creature); + return new boss_nalorakkAI (pCreature); } void AddSC_boss_nalorakk() diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp index df08fff03ff..9052911585f 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp @@ -576,9 +576,9 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_zuljin(Creature *_Creature) +CreatureAI* GetAI_boss_zuljin(Creature* pCreature) { - return new boss_zuljinAI (_Creature); + return new boss_zuljinAI (pCreature); } struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI @@ -603,9 +603,9 @@ struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI } }; -CreatureAI* GetAI_feather_vortexAI(Creature *_Creature) +CreatureAI* GetAI_feather_vortexAI(Creature* pCreature) { - return new feather_vortexAI (_Creature); + return new feather_vortexAI (pCreature); } void AddSC_boss_zuljin() diff --git a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp index c128bc51073..74c6a914534 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp @@ -91,9 +91,9 @@ struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI } } }; -CreatureAI* GetAI_npc_forest_frog(Creature *_Creature) +CreatureAI* GetAI_npc_forest_frog(Creature* pCreature) { - return new npc_forest_frogAI (_Creature); + return new npc_forest_frogAI (pCreature); } /*###### @@ -123,39 +123,39 @@ struct TRINITY_DLL_DECL npc_zulaman_hostageAI : public ScriptedAI } }; -bool GossipHello_npc_zulaman_hostage(Player* pPlayer, Creature* _Creature) +bool GossipHello_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CLOSE_GOSSIP_MENU(); - if (!_Creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) + if (!pCreature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) return true; - _Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - ScriptedInstance* pInstance = (_Creature->GetInstanceData()); + ScriptedInstance* pInstance = (pCreature->GetInstanceData()); if (pInstance) { //uint8 progress = pInstance->GetData(DATA_CHESTLOOTED); pInstance->SetData(DATA_CHESTLOOTED, 0); float x, y, z; - _Creature->GetPosition(x, y, z); - uint32 entry = _Creature->GetEntry(); + pCreature->GetPosition(x, y, z); + uint32 entry = pCreature->GetEntry(); for(uint8 i = 0; i < 4; ++i) { if (HostageEntry[i] == entry) { - _Creature->SummonGameObject(ChestEntry[i], x-2, y, z, 0, 0, 0, 0, 0, 0); + pCreature->SummonGameObject(ChestEntry[i], x-2, y, z, 0, 0, 0, 0, 0, 0); break; } } - /*Creature* summon = _Creature->SummonCreature(HostageInfo[progress], x-2, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 0); + /*Creature* summon = pCreature->SummonCreature(HostageInfo[progress], x-2, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 0); if (summon) { CAST_AI(npc_zulaman_hostageAI, summon->AI())->PlayerGUID = pPlayer->GetGUID(); @@ -168,9 +168,9 @@ bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* _Creature, uint return true; } -CreatureAI* GetAI_npc_zulaman_hostage(Creature *_Creature) +CreatureAI* GetAI_npc_zulaman_hostage(Creature* pCreature) { - return new npc_zulaman_hostageAI(_Creature); + return new npc_zulaman_hostageAI(pCreature); } void AddSC_zulaman() diff --git a/src/bindings/scripts/scripts/zone/zuldrak/zuldrak.cpp b/src/bindings/scripts/scripts/zone/zuldrak/zuldrak.cpp index b1afaa9ed5e..36eddfe75ab 100644 --- a/src/bindings/scripts/scripts/zone/zuldrak/zuldrak.cpp +++ b/src/bindings/scripts/scripts/zone/zuldrak/zuldrak.cpp @@ -87,9 +87,9 @@ struct TRINITY_DLL_DECL npc_drakuru_shacklesAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_drakuru_shackles(Creature *_Creature) +CreatureAI* GetAI_npc_drakuru_shackles(Creature* pCreature) { - return new npc_drakuru_shacklesAI (_Creature); + return new npc_drakuru_shacklesAI (pCreature); } @@ -163,9 +163,9 @@ struct TRINITY_DLL_DECL npc_captured_rageclawAI : public ScriptedAI } }; -CreatureAI* GetAI_npc_captured_rageclaw(Creature *_Creature) +CreatureAI* GetAI_npc_captured_rageclaw(Creature* pCreature) { - return new npc_captured_rageclawAI (_Creature); + return new npc_captured_rageclawAI (pCreature); } void AddSC_zuldrak() diff --git a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp index 7c082f12dc0..e2228c863f8 100644 --- a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp +++ b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp @@ -95,33 +95,33 @@ struct TRINITY_DLL_DECL npc_sergeant_blyAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_npc_sergeant_bly(Creature *_Creature) +CreatureAI* GetAI_npc_sergeant_bly(Creature* pCreature) { - return new npc_sergeant_blyAI (_Creature); + return new npc_sergeant_blyAI (pCreature); } -bool GossipHello_npc_sergeant_bly(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_sergeant_bly(Player* pPlayer, Creature* pCreature) { /*if (pInstance->GetData(0) == DONE) {*/ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(1517, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1517, pCreature->GetGUID()); /*} else if (pInstance->GetData(0) == IN_PROGRESS) - pPlayer->SEND_GOSSIP_MENU(1516, _Creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(1516, pCreature->GetGUID()); else - pPlayer->SEND_GOSSIP_MENU(1515, _Creature->GetGUID());*/ + pPlayer->SEND_GOSSIP_MENU(1515, pCreature->GetGUID());*/ return true; } -bool GossipSelect_npc_sergeant_bly(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_sergeant_bly(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - _Creature->setFaction(FACTION_HOSTILE); - CAST_AI(npc_sergeant_blyAI, _Creature->AI())->AttackStart(pPlayer); + pCreature->setFaction(FACTION_HOSTILE); + CAST_AI(npc_sergeant_blyAI, pCreature->AI())->AttackStart(pPlayer); } return true; } @@ -172,27 +172,27 @@ struct TRINITY_DLL_DECL npc_weegli_blastfuseAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_npc_weegli_blastfuse(Creature *_Creature) +CreatureAI* GetAI_npc_weegli_blastfuse(Creature* pCreature) { - return new npc_weegli_blastfuseAI (_Creature); + return new npc_weegli_blastfuseAI (pCreature); } -bool GossipHello_npc_weegli_blastfuse(Player* pPlayer, Creature *_Creature) +bool GossipHello_npc_weegli_blastfuse(Player* pPlayer, Creature* pCreature) { //event not implemented yet, this is only placeholder for future developement /*if (pInstance->GetData(0) == DONE) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(1514, _Creature->GetGUID());//if event can proceed to end + pPlayer->SEND_GOSSIP_MENU(1514, pCreature->GetGUID());//if event can proceed to end } else if (pInstance->GetData(0) == IN_PROGRESS) - pPlayer->SEND_GOSSIP_MENU(1513, _Creature->GetGUID());//if event are in progress + pPlayer->SEND_GOSSIP_MENU(1513, pCreature->GetGUID());//if event are in progress else*/ - pPlayer->SEND_GOSSIP_MENU(1511, _Creature->GetGUID()); //if event not started + pPlayer->SEND_GOSSIP_MENU(1511, pCreature->GetGUID()); //if event not started return true; } -bool GossipSelect_npc_weegli_blastfuse(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action) +bool GossipSelect_npc_weegli_blastfuse(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) { diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp index c5f45901245..ab2b4c81704 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp @@ -77,9 +77,9 @@ struct TRINITY_DLL_DECL boss_gahzrankaAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_gahzranka(Creature *_Creature) +CreatureAI* GetAI_boss_gahzranka(Creature* pCreature) { - return new boss_gahzrankaAI (_Creature); + return new boss_gahzrankaAI (pCreature); } void AddSC_boss_gahzranka() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp index ec865707e00..696bcded32d 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp @@ -77,9 +77,9 @@ struct TRINITY_DLL_DECL boss_grilekAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_grilek(Creature *_Creature) +CreatureAI* GetAI_boss_grilek(Creature* pCreature) { - return new boss_grilekAI (_Creature); + return new boss_grilekAI (pCreature); } void AddSC_boss_grilek() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp index 0618fb9bf32..2fb48ae3a5d 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp @@ -234,9 +234,9 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_hakkar(Creature *_Creature) +CreatureAI* GetAI_boss_hakkar(Creature* pCreature) { - return new boss_hakkarAI (_Creature); + return new boss_hakkarAI (pCreature); } void AddSC_boss_hakkar() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp index 789e7cc2f97..05ab262c21c 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp @@ -89,9 +89,9 @@ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_hazzarah(Creature *_Creature) +CreatureAI* GetAI_boss_hazzarah(Creature* pCreature) { - return new boss_hazzarahAI (_Creature); + return new boss_hazzarahAI (pCreature); } void AddSC_boss_hazzarah() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp index 23ba0102e72..5b295f35623 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp @@ -265,14 +265,14 @@ struct TRINITY_DLL_DECL mob_batriderAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_jeklik(Creature *_Creature) +CreatureAI* GetAI_boss_jeklik(Creature* pCreature) { - return new boss_jeklikAI (_Creature); + return new boss_jeklikAI (pCreature); } -CreatureAI* GetAI_mob_batrider(Creature *_Creature) +CreatureAI* GetAI_mob_batrider(Creature* pCreature) { - return new mob_batriderAI (_Creature); + return new mob_batriderAI (pCreature); } void AddSC_boss_jeklik() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp index aa287e1b263..e1c5e0ea7c5 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp @@ -238,19 +238,19 @@ struct TRINITY_DLL_DECL mob_shade_of_jindoAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_jindo(Creature *_Creature) +CreatureAI* GetAI_boss_jindo(Creature* pCreature) { - return new boss_jindoAI (_Creature); + return new boss_jindoAI (pCreature); } -CreatureAI* GetAI_mob_healing_ward(Creature *_Creature) +CreatureAI* GetAI_mob_healing_ward(Creature* pCreature) { - return new mob_healing_wardAI (_Creature); + return new mob_healing_wardAI (pCreature); } -CreatureAI* GetAI_mob_shade_of_jindo(Creature *_Creature) +CreatureAI* GetAI_mob_shade_of_jindo(Creature* pCreature) { - return new mob_shade_of_jindoAI (_Creature); + return new mob_shade_of_jindoAI (pCreature); } void AddSC_boss_jindo() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp index dc3ed1669a6..892e1cdf8b4 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp @@ -306,14 +306,14 @@ struct TRINITY_DLL_DECL mob_ohganAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_mandokir(Creature *_Creature) +CreatureAI* GetAI_boss_mandokir(Creature* pCreature) { - return new boss_mandokirAI (_Creature); + return new boss_mandokirAI (pCreature); } -CreatureAI* GetAI_mob_ohgan(Creature *_Creature) +CreatureAI* GetAI_mob_ohgan(Creature* pCreature) { - return new mob_ohganAI (_Creature); + return new mob_ohganAI (pCreature); } void AddSC_boss_mandokir() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp index ccad5b47dd7..595716f1487 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp @@ -234,14 +234,14 @@ struct TRINITY_DLL_DECL mob_spawn_of_marliAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_marli(Creature *_Creature) +CreatureAI* GetAI_boss_marli(Creature* pCreature) { - return new boss_marliAI (_Creature); + return new boss_marliAI (pCreature); } -CreatureAI* GetAI_mob_spawn_of_marli(Creature *_Creature) +CreatureAI* GetAI_mob_spawn_of_marli(Creature* pCreature) { - return new mob_spawn_of_marliAI (_Creature); + return new mob_spawn_of_marliAI (pCreature); } void AddSC_boss_marli() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp index 61f7c58bcf2..608897ad18d 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp @@ -136,9 +136,9 @@ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_renataki(Creature *_Creature) +CreatureAI* GetAI_boss_renataki(Creature* pCreature) { - return new boss_renatakiAI (_Creature); + return new boss_renatakiAI (pCreature); } void AddSC_boss_renataki() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp index 68219ae11bc..4c40702b691 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp @@ -519,19 +519,19 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_thekal(Creature *_Creature) +CreatureAI* GetAI_boss_thekal(Creature* pCreature) { - return new boss_thekalAI (_Creature); + return new boss_thekalAI (pCreature); } -CreatureAI* GetAI_mob_zealot_lorkhan(Creature *_Creature) +CreatureAI* GetAI_mob_zealot_lorkhan(Creature* pCreature) { - return new mob_zealot_lorkhanAI (_Creature); + return new mob_zealot_lorkhanAI (pCreature); } -CreatureAI* GetAI_mob_zealot_zath(Creature *_Creature) +CreatureAI* GetAI_mob_zealot_zath(Creature* pCreature) { - return new mob_zealot_zathAI (_Creature); + return new mob_zealot_zathAI (pCreature); } void AddSC_boss_thekal() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp index 366cc7b982c..1376db2d259 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp @@ -184,9 +184,9 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI } }; -CreatureAI* GetAI_boss_venoxis(Creature *_Creature) +CreatureAI* GetAI_boss_venoxis(Creature* pCreature) { - return new boss_venoxisAI (_Creature); + return new boss_venoxisAI (pCreature); } void AddSC_boss_venoxis() diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp index 9c6aab1a0e4..f0dbbda947a 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp @@ -69,9 +69,9 @@ struct TRINITY_DLL_DECL boss_wushoolayAI : public ScriptedAI DoMeleeAttackIfReady(); } }; -CreatureAI* GetAI_boss_wushoolay(Creature *_Creature) +CreatureAI* GetAI_boss_wushoolay(Creature* pCreature) { - return new boss_wushoolayAI (_Creature); + return new boss_wushoolayAI (pCreature); } void AddSC_boss_wushoolay() |