diff options
| author | click <click@gonnamakeyou.com> | 2011-07-02 22:52:42 +0200 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2011-07-02 22:52:42 +0200 |
| commit | 169f5da8c3120da98c01ebd8117f7aa527106206 (patch) | |
| tree | 71d19f9b87cc83d705bca3cb76680c2d66446965 /src/server/scripts/Outland | |
| parent | f91ee24184dffcd686d60dd07a1d19da3f5da818 (diff) | |
Core: Cleaning up hungarian notation - Phase2: pPlayer -> player
Diffstat (limited to 'src/server/scripts/Outland')
17 files changed, 636 insertions, 636 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index 52f83e1500c..ab307c5c647 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -42,25 +42,25 @@ class npc_spirit_of_olum : public CreatureScript public: npc_spirit_of_olum() : CreatureScript("npc_spirit_of_olum") { } - bool OnGossipSelect(Player* pPlayer, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) - pPlayer->CLOSE_GOSSIP_MENU(); + player->CLOSE_GOSSIP_MENU(); - pPlayer->InterruptNonMeleeSpells(false); - pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, false); + player->InterruptNonMeleeSpells(false); + player->CastSpell(player, SPELL_TELEPORT, false); return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { InstanceScript* pInstance = creature->GetInstanceScript(); if (pInstance && (pInstance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE)) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 29edd314f4b..37883eb14c4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1800,21 +1800,21 @@ public: } }; - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event { - pPlayer->CLOSE_GOSSIP_MENU(); + player->CLOSE_GOSSIP_MENU(); CAST_AI(npc_akama_illidan::npc_akama_illidanAI, creature->AI())->EnterPhase(PHASE_CHANNEL); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(10465, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + player->SEND_GOSSIP_MENU(10465, creature->GetGUID()); return true; } @@ -2088,10 +2088,10 @@ class gameobject_cage_trap : public GameObjectScript public: gameobject_cage_trap() : GameObjectScript("gameobject_cage_trap") { } - bool OnGossipHello(Player* pPlayer, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* pGo) { float x, y, z; - pPlayer->GetPosition(x, y, z); + player->GetPosition(x, y, z); // Grid search for nearest live Creature of entry 23304 within 10 yards if (Creature* pTrigger = pGo->FindNearestCreature(23304, 10.0f)) diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 41e610b5b14..192905bd469 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -541,24 +541,24 @@ class npc_akama_shade : public CreatureScript public: npc_akama_shade() : CreatureScript("npc_akama_shade") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { - pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_akama_shade::npc_akamaAI, creature->AI())->BeginEvent(pPlayer); + player->CLOSE_GOSSIP_MENU(); + CAST_AI(npc_akama_shade::npc_akamaAI, creature->AI())->BeginEvent(player); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->isAlive()) + if (player->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()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(907, creature->GetGUID()); } return true; diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 0b9574cda9c..aee03039ec6 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -212,13 +212,13 @@ class go_najentus_spine : public GameObjectScript public: go_najentus_spine() : GameObjectScript("go_najentus_spine") { } - bool OnGossipHello(Player* pPlayer, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* pGo) { if (InstanceScript* pInstance = pGo->GetInstanceScript()) if (Creature* Najentus = Unit::GetCreature(*pGo, pInstance->GetData64(DATA_HIGHWARLORDNAJENTUS))) if (CAST_AI(boss_najentus::boss_najentusAI, Najentus->AI())->RemoveImpalingSpine()) { - pPlayer->CastSpell(pPlayer, SPELL_CREATE_NAJENTUS_SPINE, true); + player->CastSpell(player, SPELL_CREATE_NAJENTUS_SPINE, true); pGo->Delete(); } return true; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 64dd359af40..4c142ed3930 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -974,18 +974,18 @@ class item_tainted_core : public ItemScript public: item_tainted_core() : ItemScript("item_tainted_core") { } - bool OnUse(Player* pPlayer, Item* /*_Item*/, SpellCastTargets const& targets) + bool OnUse(Player* player, Item* /*_Item*/, SpellCastTargets const& targets) { - InstanceScript *pInstance = pPlayer->GetInstanceScript(); + InstanceScript *pInstance = player->GetInstanceScript(); if (!pInstance) { - pPlayer->GetSession()->SendNotification(TEXT_NOT_INITIALIZED); + player->GetSession()->SendNotification(TEXT_NOT_INITIALIZED); return true; } Creature* Vashj = NULL; - Vashj = (Unit::GetCreature((*pPlayer), pInstance->GetData64(DATA_LADYVASHJ))); + Vashj = (Unit::GetCreature((*player), pInstance->GetData64(DATA_LADYVASHJ))); if (Vashj && (CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->Phase == 2)) { if (GameObject* gObj = targets.GetGOTarget()) @@ -1016,7 +1016,7 @@ public: if (pInstance->GetData(identifier)) { - pPlayer->GetSession()->SendNotification(TEXT_ALREADY_DEACTIVATED); + player->GetSession()->SendNotification(TEXT_ALREADY_DEACTIVATED); return true; } @@ -1032,15 +1032,15 @@ public: pInstance->SetData(identifier, 1); //remove this item - pPlayer->DestroyItemCount(31088, 1, true); + player->DestroyItemCount(31088, 1, true); return true; } else if (targets.GetUnitTarget()->GetTypeId() == TYPEID_UNIT) return false; else if (targets.GetUnitTarget()->GetTypeId() == TYPEID_PLAYER) { - pPlayer->DestroyItemCount(31088, 1, true); - pPlayer->CastSpell(targets.GetUnitTarget(), 38134, true); + player->DestroyItemCount(31088, 1, true); + player->CastSpell(targets.GetUnitTarget(), 38134, true); return true; } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 9077fe7756f..821a60fb133 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -155,14 +155,14 @@ public: StartEvent(); } - void ApplyWateryGrave(Unit* pPlayer, uint8 i) + void ApplyWateryGrave(Unit* player, uint8 i) { switch(i) { - case 0: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_1, true); break; - case 1: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_2, true); break; - case 2: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_3, true); break; - case 3: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_4, true); break; + case 0: player->CastSpell(player, SPELL_WATERY_GRAVE_1, true); break; + case 1: player->CastSpell(player, SPELL_WATERY_GRAVE_2, true); break; + case 2: player->CastSpell(player, SPELL_WATERY_GRAVE_3, true); break; + case 3: player->CastSpell(player, SPELL_WATERY_GRAVE_4, true); break; } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 8dd2db54e75..73719c14163 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -52,7 +52,7 @@ class go_bridge_console : public GameObjectScript public: go_bridge_console() : GameObjectScript("go_bridge_console") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) { InstanceScript* pInstance = go->GetInstanceScript(); @@ -134,33 +134,33 @@ class instance_serpent_shrine : public InstanceMapScript return; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (Player* pPlayer = i->getSource()) + if (Player* player = i->getSource()) { - if (pPlayer->isAlive() && /*i->getSource()->GetPositionZ() <= -21.434931f*/pPlayer->IsInWater()) + if (player->isAlive() && /*i->getSource()->GetPositionZ() <= -21.434931f*/player->IsInWater()) { if (Water == WATERSTATE_SCALDING) { - if (!pPlayer->HasAura(SPELL_SCALDINGWATER)) + if (!player->HasAura(SPELL_SCALDINGWATER)) { - pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER, true); + player->CastSpell(player, SPELL_SCALDINGWATER, true); } } else if (Water == WATERSTATE_FRENZY) { //spawn frenzy if (DoSpawnFrenzy) { - if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000)) + if (Creature* frenzy = player->SummonCreature(MOB_COILFANG_FRENZY, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000)) { - frenzy->Attack(pPlayer, false); + frenzy->Attack(player, false); frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); } DoSpawnFrenzy = false; } } } - if (!pPlayer->IsInWater()) - pPlayer->RemoveAurasDueToSpell(SPELL_SCALDINGWATER); + if (!player->IsInWater()) + player->RemoveAurasDueToSpell(SPELL_SCALDINGWATER); } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 6eae132ebbc..451983eeaf4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -43,7 +43,7 @@ class go_main_chambers_access_panel : public GameObjectScript public: go_main_chambers_access_panel() : GameObjectScript("go_main_chambers_access_panel") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) { InstanceScript* pInstance = go->GetInstanceScript(); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index a7368c434da..e95eaaa8e7e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -611,7 +611,7 @@ public: { } - bool OnGossipHello(Player* pPlayer, GameObject* pGO) + bool OnGossipHello(Player* player, GameObject* pGO) { InstanceScript* pInstance = pGO->GetInstanceScript(); @@ -625,13 +625,13 @@ public: return true; // if exhausted or already channeling return - if (pPlayer->HasAura(SPELL_MIND_EXHAUSTION) || pPlayer->HasAura(SPELL_SHADOW_GRASP)) + if (player->HasAura(SPELL_MIND_EXHAUSTION) || player->HasAura(SPELL_SHADOW_GRASP)) return true; - pPlayer->InterruptNonMeleeSpells(false); - pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP, true); - pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP_VISUAL, false); - CAST_AI(boss_magtheridon::boss_magtheridonAI, Magtheridon->AI())->SetClicker(pGO->GetGUID(), pPlayer->GetGUID()); + player->InterruptNonMeleeSpells(false); + player->CastSpell(player, SPELL_SHADOW_GRASP, true); + player->CastSpell(player, SPELL_SHADOW_GRASP_VISUAL, false); + CAST_AI(boss_magtheridon::boss_magtheridonAI, Magtheridon->AI())->SetClicker(pGO->GetGUID(), player->GetGUID()); return true; } }; diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index c9f2f859e16..771968de9bb 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -312,23 +312,23 @@ class npc_overseer_nuaar : public CreatureScript public: npc_overseer_nuaar() : CreatureScript("npc_overseer_nuaar") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { - pPlayer->SEND_GOSSIP_MENU(10533, creature->GetGUID()); - pPlayer->AreaExploredOrEventHappens(10682); + player->SEND_GOSSIP_MENU(10533, creature->GetGUID()); + player->AreaExploredOrEventHappens(10682); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (player->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10532, creature->GetGUID()); + player->SEND_GOSSIP_MENU(10532, creature->GetGUID()); return true; } @@ -347,29 +347,29 @@ class npc_saikkal_the_elder : public CreatureScript public: npc_saikkal_the_elder() : CreatureScript("npc_saikkal_the_elder") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(10795, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->SEND_GOSSIP_MENU(10795, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); - pPlayer->SEND_GOSSIP_MENU(10796, creature->GetGUID()); + player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); + player->SEND_GOSSIP_MENU(10796, creature->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (player->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10794, creature->GetGUID()); + player->SEND_GOSSIP_MENU(10794, creature->GetGUID()); return true; } @@ -385,9 +385,9 @@ class go_legion_obelisk : public GameObjectScript public: go_legion_obelisk() : GameObjectScript("go_legion_obelisk") { } - bool OnGossipHello(Player* pPlayer, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* pGo) { - if (pPlayer->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) + if (player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) { switch(pGo->GetEntry()) { @@ -510,7 +510,7 @@ public: void MovementInform(uint32 /*type*/, uint32 id) { - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); + Player* player = Unit::GetPlayer(*me, PlayerGUID); if (id == 1) { GameObject* Keg = me->FindNearestGameObject(GO_KEG, 20); @@ -520,8 +520,8 @@ public: me->SetReactState(REACT_AGGRESSIVE); me->GetMotionMaster()->MoveTargetedHome(); Creature* Credit = me->FindNearestCreature(NPC_QUEST_CREDIT, 50, true); - if (pPlayer && Credit) - pPlayer->KilledMonster(Credit->GetCreatureInfo(), Credit->GetGUID()); + if (player && Credit) + player->KilledMonster(Credit->GetCreatureInfo(), Credit->GetGUID()); } } diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 4c2d1e0ed83..20e1415cfa6 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -210,7 +210,7 @@ class go_haaleshi_altar : public GameObjectScript public: go_haaleshi_altar() : GameObjectScript("go_haaleshi_altar") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* pGo) { pGo->SummonCreature(C_AERANAS, -1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000); return false; @@ -234,22 +234,22 @@ class npc_naladu : public CreatureScript public: npc_naladu() : CreatureScript("npc_naladu") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_NALADU1, creature->GetGUID()); + player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_NALADU1, creature->GetGUID()); return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NALADU_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NALADU_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -274,38 +274,38 @@ class npc_tracy_proudwell : public CreatureScript public: npc_tracy_proudwell() : CreatureScript("npc_tracy_proudwell") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TRACY_PROUDWELL_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TRACY_PROUDWELL1, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TRACY_PROUDWELL_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TRACY_PROUDWELL1, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_TRADE: - pPlayer->GetSession()->SendListInventory(creature->GetGUID()); + player->GetSession()->SendListInventory(creature->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); if (creature->isVendor()) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_REDEEM_MARKS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_REDEEM_MARKS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (pPlayer->GetQuestStatus(QUEST_DIGGING_FOR_PRAYER_BEADS) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TRACY_PROUDWELL_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + if (player->GetQuestStatus(QUEST_DIGGING_FOR_PRAYER_BEADS) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TRACY_PROUDWELL_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -331,34 +331,34 @@ class npc_trollbane : public CreatureScript public: npc_trollbane() : CreatureScript("npc_trollbane") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE1, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE1, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE2, creature->GetGUID()); + player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE3, creature->GetGUID()); + player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TROLLBANE3, creature->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -385,12 +385,12 @@ class npc_wounded_blood_elf : public CreatureScript public: npc_wounded_blood_elf() : CreatureScript("npc_wounded_blood_elf") { } - bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH) { if (npc_escortAI* pEscortAI = CAST_AI(npc_wounded_blood_elf::npc_wounded_blood_elfAI, creature->AI())) - pEscortAI->Start(true, false, pPlayer->GetGUID()); + pEscortAI->Start(true, false, player->GetGUID()); // Change faction so mobs attack creature->setFaction(775); @@ -410,35 +410,35 @@ public: void WaypointReached(uint32 i) { - Player* pPlayer = GetPlayerForEscort(); + Player* player = GetPlayerForEscort(); - if (!pPlayer) + if (!player) return; switch (i) { case 0: - DoScriptText(SAY_ELF_START, me, pPlayer); + DoScriptText(SAY_ELF_START, me, player); break; case 9: - DoScriptText(SAY_ELF_SUMMON1, me, pPlayer); + DoScriptText(SAY_ELF_SUMMON1, me, player); // Spawn two Haal'eshi Talonguard DoSpawnCreature(16967, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); DoSpawnCreature(16967, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 13: - DoScriptText(SAY_ELF_RESTING, me, pPlayer); + DoScriptText(SAY_ELF_RESTING, me, player); break; case 14: - DoScriptText(SAY_ELF_SUMMON2, me, pPlayer); + DoScriptText(SAY_ELF_SUMMON2, me, player); // Spawn two Haal'eshi Windwalker DoSpawnCreature(16966, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); DoSpawnCreature(16966, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 27: - DoScriptText(SAY_ELF_COMPLETE, me, pPlayer); + DoScriptText(SAY_ELF_COMPLETE, me, player); // Award quest credit - pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH, me); + player->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH, me); break; } } diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index 035334e1c6e..97bf0d1c400 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -107,37 +107,37 @@ class mob_lump : public CreatureScript public: mob_lump() : CreatureScript("mob_lump") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9353, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(9353, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9354, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->SEND_GOSSIP_MENU(9354, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(9355, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + player->SEND_GOSSIP_MENU(9355, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->SEND_GOSSIP_MENU(9356, creature->GetGUID()); - pPlayer->TalkedToCreature(18354, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9356, creature->GetGUID()); + player->TalkedToCreature(18354, creature->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + if (player->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9352, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9352, creature->GetGUID()); return true; } @@ -301,80 +301,80 @@ class npc_altruis_the_sufferer : public CreatureScript public: npc_altruis_the_sufferer() : CreatureScript("npc_altruis_the_sufferer") { } - bool OnQuestAccept(Player* pPlayer, Creature* /*creature*/, Quest const* /*quest*/) + bool OnQuestAccept(Player* player, Creature* /*creature*/, Quest const* /*quest*/) { - if (!pPlayer->GetQuestRewardStatus(9991)) //Survey the Land, q-id 9991 + if (!player->GetQuestRewardStatus(9991)) //Survey the Land, q-id 9991 { - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->ActivateTaxiPathTo(532); //TaxiPath 532 + player->CLOSE_GOSSIP_MENU(); + player->ActivateTaxiPathTo(532); //TaxiPath 532 } return true; } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+10: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(9420, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); + player->SEND_GOSSIP_MENU(9420, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+11: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(9421, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); + player->SEND_GOSSIP_MENU(9421, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+12: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(9422, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); + player->SEND_GOSSIP_MENU(9422, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+13: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); - pPlayer->SEND_GOSSIP_MENU(9423, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); + player->SEND_GOSSIP_MENU(9423, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+14: - pPlayer->SEND_GOSSIP_MENU(9424, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9424, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+20: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); - pPlayer->SEND_GOSSIP_MENU(9427, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); + player->SEND_GOSSIP_MENU(9427, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+21: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(9991); + player->CLOSE_GOSSIP_MENU(); + player->AreaExploredOrEventHappens(9991); break; 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()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31); + player->SEND_GOSSIP_MENU(384, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+31: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(10646); + player->CLOSE_GOSSIP_MENU(); + player->AreaExploredOrEventHappens(10646); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); //gossip before obtaining Survey the Land - if (pPlayer->GetQuestStatus(9991) == QUEST_STATUS_NONE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10); + if (player->GetQuestStatus(9991) == QUEST_STATUS_NONE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10); //gossip when Survey the Land is incomplete (technically, after the flight) - if (pPlayer->GetQuestStatus(9991) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20); + if (player->GetQuestStatus(9991) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20); //wowwiki.com/Varedis - if (pPlayer->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30); + if (player->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30); - pPlayer->SEND_GOSSIP_MENU(9419, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9419, creature->GetGUID()); return true; } @@ -406,86 +406,86 @@ class npc_greatmother_geyah : public CreatureScript public: npc_greatmother_geyah() : CreatureScript("npc_greatmother_geyah") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 5: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 6: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 7: - pPlayer->AreaExploredOrEventHappens(10044); - pPlayer->CLOSE_GOSSIP_MENU(); + player->AreaExploredOrEventHappens(10044); + player->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 10: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 11: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 12: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 13: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 14: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 15: - pPlayer->AreaExploredOrEventHappens(10172); - pPlayer->CLOSE_GOSSIP_MENU(); + player->AreaExploredOrEventHappens(10172); + player->CLOSE_GOSSIP_MENU(); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); - if (pPlayer->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE) + if (player->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } - else if (pPlayer->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE) + else if (player->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -510,59 +510,59 @@ class npc_lantresor_of_the_blade : public CreatureScript public: npc_lantresor_of_the_blade() : CreatureScript("npc_lantresor_of_the_blade") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9362, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(9362, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9363, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->SEND_GOSSIP_MENU(9363, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(9364, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + player->SEND_GOSSIP_MENU(9364, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(9365, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); + player->SEND_GOSSIP_MENU(9365, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(9366, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); + player->SEND_GOSSIP_MENU(9366, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); - pPlayer->SEND_GOSSIP_MENU(9367, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); + player->SEND_GOSSIP_MENU(9367, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); - pPlayer->SEND_GOSSIP_MENU(9368, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); + player->SEND_GOSSIP_MENU(9368, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: - pPlayer->SEND_GOSSIP_MENU(9369, creature->GetGUID()); - if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE) - pPlayer->AreaExploredOrEventHappens(10107); - if (pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) - pPlayer->AreaExploredOrEventHappens(10108); + player->SEND_GOSSIP_MENU(9369, creature->GetGUID()); + if (player->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE) + player->AreaExploredOrEventHappens(10107); + if (player->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) + player->AreaExploredOrEventHappens(10108); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); - if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + if (player->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9361, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9361, creature->GetGUID()); return true; } @@ -604,7 +604,7 @@ class npc_maghar_captive : public CreatureScript public: npc_maghar_captive() : CreatureScript("npc_maghar_captive") { } - bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { @@ -613,7 +613,7 @@ public: creature->SetStandState(UNIT_STAND_STATE_STAND); creature->setFaction(232); - pEscortAI->Start(true, false, pPlayer->GetGUID(), pQuest); + pEscortAI->Start(true, false, player->GetGUID(), pQuest); DoScriptText(SAY_MAG_START, creature); @@ -668,8 +668,8 @@ public: case 16: DoScriptText(SAY_MAG_COMPLETE, me); - if (Player* pPlayer = GetPlayerForEscort()) - pPlayer->GroupEventHappens(QUEST_TOTEM_KARDASH_H, me); + if (Player* player = GetPlayerForEscort()) + player->GroupEventHappens(QUEST_TOTEM_KARDASH_H, me); SetRun(); break; @@ -851,13 +851,13 @@ public: if (fleeing && me->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE) fleeing = false; - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); - if (pPlayer && me->IsWithinDistInMap(pPlayer, 30)) + Player* player = Unit::GetPlayer(*me, PlayerGUID); + if (player && me->IsWithinDistInMap(player, 30)) { if (!fleeing) { me->DeleteThreatList(); - me->GetMotionMaster()->MoveFleeing(pPlayer); + me->GetMotionMaster()->MoveFleeing(player); fleeing = true; } } diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index eef1036271d..820b654140f 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -307,12 +307,12 @@ class go_manaforge_control_console : public GameObjectScript public: go_manaforge_control_console() : GameObjectScript("go_manaforge_control_console") { } - bool OnGossipHello(Player* pPlayer, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* pGo) { if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { - pPlayer->PrepareQuestMenu(pGo->GetGUID()); - pPlayer->SendPreparedQuest(pGo->GetGUID()); + player->PrepareQuestMenu(pGo->GetGUID()); + player->SendPreparedQuest(pGo->GetGUID()); } Creature* manaforge = NULL; @@ -320,30 +320,30 @@ public: switch(pGo->GetAreaId()) { case 3726: //b'naar - if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29366, 1)) - manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE, 2918.95f, 4189.98f, 161.88f, 0.34f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); + if ((player->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && + player->HasItemCount(29366, 1)) + manaforge = player->SummonCreature(ENTRY_BNAAR_C_CONSOLE, 2918.95f, 4189.98f, 161.88f, 0.34f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3730: //coruu - if ((pPlayer->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29396, 1)) - manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE, 2426.77f, 2750.38f, 133.24f, 2.14f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); + if ((player->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) && + player->HasItemCount(29396, 1)) + manaforge = player->SummonCreature(ENTRY_CORUU_C_CONSOLE, 2426.77f, 2750.38f, 133.24f, 2.14f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3734: //duro - if ((pPlayer->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29397, 1)) - manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE, 2976.48f, 2183.29f, 163.20f, 1.85f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); + if ((player->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) && + player->HasItemCount(29397, 1)) + manaforge = player->SummonCreature(ENTRY_DURO_C_CONSOLE, 2976.48f, 2183.29f, 163.20f, 1.85f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3722: //ara - if ((pPlayer->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29411, 1)) - manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE, 4013.71f, 4028.76f, 192.10f, 1.25f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); + if ((player->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) && + player->HasItemCount(29411, 1)) + manaforge = player->SummonCreature(ENTRY_ARA_C_CONSOLE, 4013.71f, 4028.76f, 192.10f, 1.25f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; } if (manaforge) { - CAST_AI(npc_manaforge_control_console::npc_manaforge_control_consoleAI, manaforge->AI())->someplayer = pPlayer->GetGUID(); + CAST_AI(npc_manaforge_control_console::npc_manaforge_control_consoleAI, manaforge->AI())->someplayer = player->GetGUID(); CAST_AI(npc_manaforge_control_console::npc_manaforge_control_consoleAI, manaforge->AI())->goConsole = pGo->GetGUID(); pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } @@ -433,9 +433,9 @@ public: { Creature* ardonis = Unit::GetCreature(*me, ardonisGUID); Creature* pathaleon = Unit::GetCreature(*me, pathaleonGUID); - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); + Player* player = Unit::GetPlayer(*me, PlayerGUID); - if (!ardonis || !pathaleon || !pPlayer) + if (!ardonis || !pathaleon || !player) return; //Calculate the angle to Pathaleon @@ -444,10 +444,10 @@ public: //Turn Dawnforge and update me->SetOrientation(angle_dawnforge); - me->SendUpdateToPlayer(pPlayer); + me->SendUpdateToPlayer(player); //Turn Ardonis and update ardonis->SetOrientation(angle_ardonis); - ardonis->SendUpdateToPlayer(pPlayer); + ardonis->SendUpdateToPlayer(player); //Set them to kneel me->SetStandState(UNIT_STAND_STATE_KNEEL); @@ -459,9 +459,9 @@ public: { if (Unit* ardonis = Unit::GetUnit(*me, ardonisGUID)) { - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); + Player* player = Unit::GetPlayer(*me, PlayerGUID); - if (!pPlayer) + if (!player) return; angle_dawnforge = me->GetAngle(ardonis->GetPositionX(), ardonis->GetPositionY()); @@ -469,10 +469,10 @@ public: //Turn Dawnforge and update me->SetOrientation(angle_dawnforge); - me->SendUpdateToPlayer(pPlayer); + me->SendUpdateToPlayer(player); //Turn Ardonis and update ardonis->SetOrientation(angle_ardonis); - ardonis->SendUpdateToPlayer(pPlayer); + ardonis->SendUpdateToPlayer(player); //Set state me->SetStandState(UNIT_STAND_STATE_STAND); @@ -480,7 +480,7 @@ public: } } - bool CanStartEvent(Player* pPlayer) + bool CanStartEvent(Player* player) { if (!isEvent) { @@ -489,7 +489,7 @@ public: return false; ardonisGUID = ardonis->GetGUID(); - PlayerGUID = pPlayer->GetGUID(); + PlayerGUID = player->GetGUID(); isEvent = true; @@ -516,9 +516,9 @@ public: Unit* ardonis = Unit::GetUnit(*me, ardonisGUID); Unit* pathaleon = Unit::GetUnit(*me, pathaleonGUID); - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); + Player* player = Unit::GetPlayer(*me, PlayerGUID); - if (!ardonis || !pPlayer) + if (!ardonis || !player) { Reset(); return; @@ -626,7 +626,7 @@ public: //Phase 10 Dawnforge say case 10: DoScriptText(SAY_COMMANDER_DAWNFORGE_5, me); - pPlayer->AreaExploredOrEventHappens(QUEST_INFO_GATHERING); + player->AreaExploredOrEventHappens(QUEST_INFO_GATHERING); Reset(); break; } @@ -640,20 +640,20 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry * /*at*/) { //if player lost aura or not have at all, we should not try start event. - if (!pPlayer->HasAura(SPELL_SUNFURY_DISGUISE)) + if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) return false; - if (pPlayer->isAlive() && pPlayer->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE) + if (player->isAlive() && player->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE) { - Creature* Dawnforge = pPlayer->FindNearestCreature(CreatureEntry[1], 30.0f); + Creature* Dawnforge = player->FindNearestCreature(CreatureEntry[1], 30.0f); if (!Dawnforge) return false; - if (CAST_AI(npc_commander_dawnforge::npc_commander_dawnforgeAI, Dawnforge->AI())->CanStartEvent(pPlayer)) + if (CAST_AI(npc_commander_dawnforge::npc_commander_dawnforgeAI, Dawnforge->AI())->CanStartEvent(player)) return true; } return false; @@ -681,35 +681,35 @@ class npc_professor_dabiri : public CreatureScript public: npc_professor_dabiri() : CreatureScript("npc_professor_dabiri") { } - bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const *quest) { if (quest->GetQuestId() == QUEST_DIMENSIUS) - DoScriptText(WHISPER_DABIRI, creature, pPlayer); + DoScriptText(WHISPER_DABIRI, creature, player); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { - creature->CastSpell(pPlayer, SPELL_PHASE_DISTRUPTOR, false); - pPlayer->CLOSE_GOSSIP_MENU(); + creature->CastSpell(player, SPELL_PHASE_DISTRUPTOR, false); + player->CLOSE_GOSSIP_MENU(); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); - if (pPlayer->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(29778, 1)) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (player->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(29778, 1)) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -756,7 +756,7 @@ public: bool Drained; uint8 WeakPercent; - Player* pPlayer; + Player* player; uint64 PlayerGUID; uint32 ManaBurnTimer; @@ -826,10 +826,10 @@ public: ManaBurnTimer = 3500; } else ManaBurnTimer -= diff; - if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) // start: support for quest 10190 + if (Player* player = Unit::GetPlayer(*me, PlayerGUID)) // start: support for quest 10190 { if (!Weak && HealthBelowPct(WeakPercent) - && pPlayer->GetQuestStatus(QUEST_RECHARGING_THE_BATTERIES) == QUEST_STATUS_INCOMPLETE) + && player->GetQuestStatus(QUEST_RECHARGING_THE_BATTERIES) == QUEST_STATUS_INCOMPLETE) { DoScriptText(EMOTE_WEAK, me); Weak = true; @@ -843,7 +843,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(uHpPct)); me->LowerPlayerDamageReq(me->GetMaxHealth() - me->GetHealth()); - me->SetInCombatWith(pPlayer); + me->SetInCombatWith(player); } } // end: support for quest 10190 @@ -871,13 +871,13 @@ class npc_bessy : public CreatureScript public: npc_bessy() : CreatureScript("npc_bessy") { } - bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == Q_ALMABTRIEB) { creature->setFaction(113); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); } return true; } @@ -894,15 +894,15 @@ public: void JustDied(Unit* /*killer*/) { - if (Player* pPlayer = GetPlayerForEscort()) - pPlayer->FailQuest(Q_ALMABTRIEB); + if (Player* player = GetPlayerForEscort()) + player->FailQuest(Q_ALMABTRIEB); } void WaypointReached(uint32 i) { - Player* pPlayer = GetPlayerForEscort(); + Player* player = GetPlayerForEscort(); - if (!pPlayer) + if (!player) return; switch(i) @@ -919,13 +919,13 @@ public: break; case 12: - if (pPlayer) - pPlayer->GroupEventHappens(Q_ALMABTRIEB, me); + if (player) + player->GroupEventHappens(Q_ALMABTRIEB, me); if (me->FindNearestCreature(N_THADELL, 30)) DoScriptText(SAY_THADELL_1, me); break; case 13: if (me->FindNearestCreature(N_THADELL, 30)) - DoScriptText(SAY_THADELL_2, me, pPlayer); break; + DoScriptText(SAY_THADELL_2, me, player); break; } } @@ -978,8 +978,8 @@ public: void WaypointReached(uint32 i) { - Player* pPlayer = GetPlayerForEscort(); - if (!pPlayer) + Player* player = GetPlayerForEscort(); + if (!player) return; switch (i) @@ -997,17 +997,17 @@ public: } break; case 36: //return and quest_complete - if (pPlayer) - pPlayer->CompleteQuest(QUEST_MARK_V_IS_ALIVE); + if (player) + player->CompleteQuest(QUEST_MARK_V_IS_ALIVE); break; } } void JustDied(Unit* /*pKiller*/) { - Player* pPlayer = GetPlayerForEscort(); - if (pPlayer) - pPlayer->FailQuest(QUEST_MARK_V_IS_ALIVE); + Player* player = GetPlayerForEscort(); + if (player) + player->FailQuest(QUEST_MARK_V_IS_ALIVE); } void UpdateAI(const uint32 uiDiff) @@ -1034,14 +1034,14 @@ public: } }; - bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) { if (npc_maxx_a_million_escortAI* pEscortAI = CAST_AI(npc_maxx_a_million_escort::npc_maxx_a_million_escortAI, creature->AI())) { creature->setFaction(113); - pEscortAI->Start(false, false, pPlayer->GetGUID()); + pEscortAI->Start(false, false, player->GetGUID()); } } return true; diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index b8a893aeedc..336263039b7 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -413,21 +413,21 @@ class npc_drake_dealer_hurlunk : public CreatureScript public: npc_drake_dealer_hurlunk() : CreatureScript("npc_drake_dealer_hurlunk") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->GetSession()->SendListInventory(creature->GetGUID()); + player->GetSession()->SendListInventory(creature->GetGUID()); return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isVendor() && pPlayer->GetReputationRank(1015) == REP_EXALTED) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + if (creature->isVendor() && player->GetReputationRank(1015) == REP_EXALTED) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -446,40 +446,40 @@ class npcs_flanis_swiftwing_and_kagrosh : public CreatureScript public: npcs_flanis_swiftwing_and_kagrosh() : CreatureScript("npcs_flanis_swiftwing_and_kagrosh") { } - bool OnGossipSelect(Player* pPlayer, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 30658, 1, false); + uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 30658, 1, false); if (msg == EQUIP_ERR_OK) { - pPlayer->StoreNewItem(dest, 30658, 1, true); - pPlayer->PlayerTalkClass->ClearMenus(); + player->StoreNewItem(dest, 30658, 1, true); + player->PlayerTalkClass->ClearMenus(); } } if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 30659, 1, false); + uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 30659, 1, false); if (msg == EQUIP_ERR_OK) { - pPlayer->StoreNewItem(dest, 30659, 1, true); - pPlayer->PlayerTalkClass->ClearMenus(); + player->StoreNewItem(dest, 30659, 1, true); + player->PlayerTalkClass->ClearMenus(); } } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658, 1, true)) - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659, 1, true)) - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + if (player->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30658, 1, true)) + player->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (player->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30659, 1, true)) + player->ADD_GOSSIP_ITEM(0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -504,52 +504,52 @@ class npc_murkblood_overseer : public CreatureScript public: npc_murkblood_overseer() : CreatureScript("npc_murkblood_overseer") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->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()); + player->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + player->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()); + player->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); + player->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()); + player->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); + player->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()); + player->SEND_GOSSIP_MENU(10940, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); + player->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()); + player->SEND_GOSSIP_MENU(10940, creature->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->AreaExploredOrEventHappens(QUEST_11082); + player->SEND_GOSSIP_MENU(10940, creature->GetGUID()); + creature->CastSpell(player, 41121, false); + player->AreaExploredOrEventHappens(QUEST_11082); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (player->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10940, creature->GetGUID()); + player->SEND_GOSSIP_MENU(10940, creature->GetGUID()); return true; } @@ -572,59 +572,59 @@ class npc_oronok_tornheart : public CreatureScript public: npc_oronok_tornheart() : CreatureScript("npc_oronok_tornheart") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->GetSession()->SendListInventory(creature->GetGUID()); + player->GetSession()->SendListInventory(creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF: - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10313, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->SEND_GOSSIP_MENU(10313, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(10314, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->SEND_GOSSIP_MENU(10314, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(10315, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + player->SEND_GOSSIP_MENU(10315, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(10316, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); + player->SEND_GOSSIP_MENU(10316, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(10317, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); + player->SEND_GOSSIP_MENU(10317, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: - pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(10318, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); + player->SEND_GOSSIP_MENU(10318, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(10519); + player->CLOSE_GOSSIP_MENU(); + player->AreaExploredOrEventHappens(10519); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); if (creature->isVendor()) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (pPlayer->GetQuestStatus(10519) == QUEST_STATUS_INCOMPLETE) + if (player->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()); + player->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + player->SEND_GOSSIP_MENU(10312, creature->GetGUID()); }else - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -647,10 +647,10 @@ class npc_karynaku : public CreatureScript public: npc_karynaku() : CreatureScript("npc_karynaku") { } - bool OnQuestAccept(Player* pPlayer, Creature* /*creature*/, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* /*creature*/, Quest const* quest) { if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER) - pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID); //pPlayer->ActivateTaxiPathTo(649); + player->ActivateTaxiPathTo(TAXI_PATH_ID); //player->ActivateTaxiPathTo(649); return true; } @@ -698,11 +698,11 @@ class npc_overlord_morghor : public CreatureScript public: npc_overlord_morghor() : CreatureScript("npc_overlord_morghor") { } - bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest *_Quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) { if (_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE) { - CAST_AI(npc_overlord_morghor::npc_overlord_morghorAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_overlord_morghor::npc_overlord_morghorAI, creature->AI())->PlayerGUID = player->GetGUID(); CAST_AI(npc_overlord_morghor::npc_overlord_morghorAI, creature->AI())->StartEvent(); return true; } @@ -750,9 +750,9 @@ public: } if (PlayerGUID) { - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); - if (pPlayer) - DoScriptText(OVERLORD_SAY_1, me, pPlayer); + Player* player = Unit::GetPlayer(*me, PlayerGUID); + if (player) + DoScriptText(OVERLORD_SAY_1, me, player); } ConversationTimer = 4200; Step = 0; @@ -914,15 +914,15 @@ class npc_earthmender_wilda : public CreatureScript public: npc_earthmender_wilda() : CreatureScript("npc_earthmender_wilda") { } - bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) { if (pQuest->GetQuestId() == QUEST_ESCAPE_COILSCAR) { - DoScriptText(SAY_WIL_START, creature, pPlayer); + DoScriptText(SAY_WIL_START, creature, player); creature->setFaction(FACTION_EARTHEN); if (npc_earthmender_wildaAI* pEscortAI = CAST_AI(npc_earthmender_wilda::npc_earthmender_wildaAI, creature->AI())) - pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); + pEscortAI->Start(false, false, player->GetGUID(), pQuest); } return true; } @@ -945,22 +945,22 @@ public: void WaypointReached(uint32 uiPointId) { - Player* pPlayer = GetPlayerForEscort(); + Player* player = GetPlayerForEscort(); - if (!pPlayer) + if (!player) return; switch(uiPointId) { case 13: - DoScriptText(SAY_WIL_PROGRESS1, me, pPlayer); + DoScriptText(SAY_WIL_PROGRESS1, me, player); DoSpawnAssassin(); break; case 14: DoSpawnAssassin(); break; case 15: - DoScriptText(SAY_WIL_FIND_EXIT, me, pPlayer); + DoScriptText(SAY_WIL_FIND_EXIT, me, player); break; case 19: DoRandomSay(); @@ -987,7 +987,7 @@ public: DoSpawnAssassin(); break; case 39: - DoScriptText(SAY_WIL_JUST_AHEAD, me, pPlayer); + DoScriptText(SAY_WIL_JUST_AHEAD, me, player); break; case 43: DoRandomSay(); @@ -996,10 +996,10 @@ public: DoSpawnAssassin(); break; case 50: - DoScriptText(SAY_WIL_END, me, pPlayer); + DoScriptText(SAY_WIL_END, me, player); - if (Player* pPlayer = GetPlayerForEscort()) - pPlayer->GroupEventHappens(QUEST_ESCAPE_COILSCAR, me); + if (Player* player = GetPlayerForEscort()) + player->GroupEventHappens(QUEST_ESCAPE_COILSCAR, me); break; } } @@ -1374,12 +1374,12 @@ public: void CheckEventFail() { - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); + Player* player = Unit::GetPlayer(*me, PlayerGUID); - if (!pPlayer) + if (!player) return; - if (Group *EventGroup = pPlayer->GetGroup()) + if (Group *EventGroup = player->GetGroup()) { Player* GroupMember; @@ -1425,9 +1425,9 @@ public: } Failed = true; } - } else if (pPlayer->isDead() || !pPlayer->IsWithinDistInMap(me, EVENT_AREA_RADIUS)) + } else if (player->isDead() || !player->IsWithinDistInMap(me, EVENT_AREA_RADIUS)) { - pPlayer->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH); + player->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH); Failed = true; } } diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index cf547ea2c36..50fbd1056db 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -55,24 +55,24 @@ class npc_raliq_the_drunk : public CreatureScript public: npc_raliq_the_drunk() : CreatureScript("npc_raliq_the_drunk") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { - pPlayer->CLOSE_GOSSIP_MENU(); + player->CLOSE_GOSSIP_MENU(); creature->setFaction(FACTION_HOSTILE_RD); - creature->AI()->AttackStart(pPlayer); + creature->AI()->AttackStart(player); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9440, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9440, creature->GetGUID()); return true; } @@ -129,18 +129,18 @@ class npc_salsalabim : public CreatureScript public: npc_salsalabim() : CreatureScript("npc_salsalabim") { } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE) + if (player->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE) { creature->setFaction(FACTION_HOSTILE_SA); - creature->AI()->AttackStart(pPlayer); + creature->AI()->AttackStart(player); } else { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } return true; } @@ -206,42 +206,42 @@ class npc_shattrathflaskvendors : public CreatureScript public: npc_shattrathflaskvendors() : CreatureScript("npc_shattrathflaskvendors") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->GetSession()->SendListInventory(creature->GetGUID()); + player->GetSession()->SendListInventory(creature->GetGUID()); return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->GetEntry() == 23484) { // Aldor vendor - if (creature->isVendor() && (pPlayer->GetReputationRank(932) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) + if (creature->isVendor() && (player->GetReputationRank(932) == REP_EXALTED) && (player->GetReputationRank(935) == REP_EXALTED) && (player->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()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + player->SEND_GOSSIP_MENU(11085, creature->GetGUID()); } else { - pPlayer->SEND_GOSSIP_MENU(11083, creature->GetGUID()); + player->SEND_GOSSIP_MENU(11083, creature->GetGUID()); } } if (creature->GetEntry() == 23483) { // Scryers vendor - if (creature->isVendor() && (pPlayer->GetReputationRank(934) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED)) + if (creature->isVendor() && (player->GetReputationRank(934) == REP_EXALTED) && (player->GetReputationRank(935) == REP_EXALTED) && (player->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()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + player->SEND_GOSSIP_MENU(11085, creature->GetGUID()); } else { - pPlayer->SEND_GOSSIP_MENU(11084, creature->GetGUID()); + player->SEND_GOSSIP_MENU(11084, creature->GetGUID()); } } @@ -261,21 +261,21 @@ class npc_zephyr : public CreatureScript public: npc_zephyr() : CreatureScript("npc_zephyr") { } - bool OnGossipSelect(Player* pPlayer, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - pPlayer->CastSpell(pPlayer, 37778, false); + player->CastSpell(player, 37778, false); return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetReputationRank(989) >= REP_REVERED) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (player->GetReputationRank(989) >= REP_REVERED) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -325,37 +325,37 @@ public: void WaypointReached(uint32 i) { - Player* pPlayer = GetPlayerForEscort(); + Player* player = GetPlayerForEscort(); - if (!pPlayer) + if (!player) return; switch(i) { - case 0: DoScriptText(SAY1, me, pPlayer); break; - case 4: DoScriptText(WHISP1, me, pPlayer); break; - case 6: DoScriptText(WHISP2, me, pPlayer); break; - case 7: DoScriptText(WHISP3, me, pPlayer); break; - case 8: DoScriptText(WHISP4, me, pPlayer); break; - case 17: DoScriptText(WHISP5, me, pPlayer); break; - case 18: DoScriptText(WHISP6, me, pPlayer); break; - case 19: DoScriptText(WHISP7, me, pPlayer); break; - case 33: DoScriptText(WHISP8, me, pPlayer); break; - case 34: DoScriptText(WHISP9, me, pPlayer); break; - case 35: DoScriptText(WHISP10, me, pPlayer); break; - case 36: DoScriptText(WHISP11, me, pPlayer); break; - case 43: DoScriptText(WHISP12, me, pPlayer); break; - case 44: DoScriptText(WHISP13, me, pPlayer); break; - case 49: DoScriptText(WHISP14, me, pPlayer); break; - case 50: DoScriptText(WHISP15, me, pPlayer); break; - case 51: DoScriptText(WHISP16, me, pPlayer); break; - case 52: DoScriptText(WHISP17, me, pPlayer); break; - case 53: DoScriptText(WHISP18, me, pPlayer); break; - case 54: DoScriptText(WHISP19, me, pPlayer); break; - case 55: DoScriptText(WHISP20, me, pPlayer); break; - case 56: DoScriptText(WHISP21, me, pPlayer); - if (pPlayer) - pPlayer->GroupEventHappens(10211, me); + case 0: DoScriptText(SAY1, me, player); break; + case 4: DoScriptText(WHISP1, me, player); break; + case 6: DoScriptText(WHISP2, me, player); break; + case 7: DoScriptText(WHISP3, me, player); break; + case 8: DoScriptText(WHISP4, me, player); break; + case 17: DoScriptText(WHISP5, me, player); break; + case 18: DoScriptText(WHISP6, me, player); break; + case 19: DoScriptText(WHISP7, me, player); break; + case 33: DoScriptText(WHISP8, me, player); break; + case 34: DoScriptText(WHISP9, me, player); break; + case 35: DoScriptText(WHISP10, me, player); break; + case 36: DoScriptText(WHISP11, me, player); break; + case 43: DoScriptText(WHISP12, me, player); break; + case 44: DoScriptText(WHISP13, me, player); break; + case 49: DoScriptText(WHISP14, me, player); break; + case 50: DoScriptText(WHISP15, me, player); break; + case 51: DoScriptText(WHISP16, me, player); break; + case 52: DoScriptText(WHISP17, me, player); break; + case 53: DoScriptText(WHISP18, me, player); break; + case 54: DoScriptText(WHISP19, me, player); break; + case 55: DoScriptText(WHISP20, me, player); break; + case 56: DoScriptText(WHISP21, me, player); + if (player) + player->GroupEventHappens(10211, me); break; } } @@ -447,11 +447,11 @@ public: uint32 NextStep(uint32 Step) { - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); + Player* player = Unit::GetPlayer(*me, PlayerGUID); switch(Step) { - case 0:{ me->SetInFront(pPlayer); + case 0:{ me->SetInFront(player); Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20); if (Creepjack) Creepjack->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); @@ -459,11 +459,11 @@ public: if (Malone) Malone->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); }return 2000; - case 1: DoScriptText(SAY_1, me, pPlayer); return 3000; - case 2: DoScriptText(SAY_2, me, pPlayer); return 5000; - case 3: DoScriptText(SAY_3, me, pPlayer); return 2000; - case 4: DoScriptText(SAY_4, me, pPlayer); return 2000; - case 5: DoScriptText(SAY_5, me, pPlayer); return 2000; + case 1: DoScriptText(SAY_1, me, player); return 3000; + case 2: DoScriptText(SAY_2, me, player); return 5000; + case 3: DoScriptText(SAY_3, me, player); return 2000; + case 4: DoScriptText(SAY_4, me, player); return 2000; + case 5: DoScriptText(SAY_5, me, player); return 2000; case 6: Attack = true; return 2000; default: return 0; } @@ -481,29 +481,29 @@ public: if (Attack) { - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); + Player* player = Unit::GetPlayer(*me, PlayerGUID); me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (pPlayer) + if (player) { Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20); if (Creepjack) { - Creepjack->Attack(pPlayer, true); + Creepjack->Attack(player, true); Creepjack->setFaction(14); - Creepjack->GetMotionMaster()->MoveChase(pPlayer); + Creepjack->GetMotionMaster()->MoveChase(player); Creepjack->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } Unit* Malone = me->FindNearestCreature(NPC_MALONE, 20); if (Malone) { - Malone->Attack(pPlayer, true); + Malone->Attack(player, true); Malone->setFaction(14); - Malone->GetMotionMaster()->MoveChase(pPlayer); + Malone->GetMotionMaster()->MoveChase(player); Malone->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - DoStartMovement(pPlayer); - AttackStart(pPlayer); + DoStartMovement(player); + AttackStart(player); } Attack = false; } @@ -535,36 +535,36 @@ public: me->DeleteThreatList(); me->CombatStop(); me->GetMotionMaster()->MoveTargetedHome(); - Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); - if (pPlayer) - CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WBI, me); + Player* player = Unit::GetPlayer(*me, PlayerGUID); + if (player) + CAST_PLR(player)->GroupEventHappens(QUEST_WBI, me); } DoMeleeAttackIfReady(); } }; - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { CAST_AI(npc_dirty_larry::npc_dirty_larryAI, creature->AI())->Event = true; - CAST_AI(npc_dirty_larry::npc_dirty_larryAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); - pPlayer->CLOSE_GOSSIP_MENU(); + CAST_AI(npc_dirty_larry::npc_dirty_larryAI, creature->AI())->PlayerGUID = player->GetGUID(); + player->CLOSE_GOSSIP_MENU(); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); - if (pPlayer->GetQuestStatus(QUEST_WBI) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOOK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (player->GetQuestStatus(QUEST_WBI) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOOK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -587,26 +587,26 @@ class npc_ishanah : public CreatureScript public: npc_ishanah() : CreatureScript("npc_ishanah") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - pPlayer->SEND_GOSSIP_MENU(9458, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9458, creature->GetGUID()); else if (uiAction == GOSSIP_ACTION_INFO_DEF+2) - pPlayer->SEND_GOSSIP_MENU(9459, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9459, creature->GetGUID()); return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } @@ -629,52 +629,52 @@ class npc_khadgar : public CreatureScript public: npc_khadgar() : CreatureScript("npc_khadgar") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(9876, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->SEND_GOSSIP_MENU(9876, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(9877, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + player->SEND_GOSSIP_MENU(9877, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(9878, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); + player->SEND_GOSSIP_MENU(9878, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(9879, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); + player->SEND_GOSSIP_MENU(9879, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(9880, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); + player->SEND_GOSSIP_MENU(9880, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - pPlayer->SEND_GOSSIP_MENU(9881, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); + player->SEND_GOSSIP_MENU(9881, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9243, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->SEND_GOSSIP_MENU(9243, creature->GetGUID()); break; } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); - if (!pPlayer->hasQuest(10211)) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + if (!player->hasQuest(10211)) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9243, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9243, creature->GetGUID()); return true; } diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index f807eb0422d..538821efe61 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -206,14 +206,14 @@ public: void WaypointReached(uint32 i) { - Player* pPlayer = GetPlayerForEscort(); - if (!pPlayer) + Player* player = GetPlayerForEscort(); + if (!player) return; switch(i) { case 8: - pPlayer->AreaExploredOrEventHappens(10898); + player->AreaExploredOrEventHappens(10898); break; } } @@ -358,30 +358,30 @@ class npc_floon : public CreatureScript public: npc_floon() : CreatureScript("npc_floon") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9443, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->SEND_GOSSIP_MENU(9443, creature->GetGUID()); } if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { - pPlayer->CLOSE_GOSSIP_MENU(); + player->CLOSE_GOSSIP_MENU(); creature->setFaction(FACTION_HOSTILE_FL); - DoScriptText(SAY_FLOON_ATTACK, creature, pPlayer); - creature->AI()->AttackStart(pPlayer); + DoScriptText(SAY_FLOON_ATTACK, creature, player); + creature->AI()->AttackStart(player); } return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9442, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9442, creature->GetGUID()); return true; } @@ -469,9 +469,9 @@ public: void WaypointReached(uint32 i) { - Player* pPlayer = GetPlayerForEscort(); + Player* player = GetPlayerForEscort(); - if (!pPlayer) + if (!player) return; switch(i) @@ -483,18 +483,18 @@ public: Cage->SetGoState(GO_STATE_ACTIVE); } break; - case 2: DoScriptText(SAY_PROGRESS_1, me, pPlayer); break; - case 5: DoScriptText(SAY_PROGRESS_2, me, pPlayer); break; - case 6: DoScriptText(SAY_PROGRESS_3, me, pPlayer); break; - case 29:DoScriptText(SAY_PROGRESS_4, me, pPlayer); - if (pPlayer) + case 2: DoScriptText(SAY_PROGRESS_1, me, player); break; + case 5: DoScriptText(SAY_PROGRESS_2, me, player); break; + case 6: DoScriptText(SAY_PROGRESS_3, me, player); break; + case 29:DoScriptText(SAY_PROGRESS_4, me, player); + if (player) { - if (pPlayer->GetTeam() == ALLIANCE) - pPlayer->GroupEventHappens(QUEST_EFTW_A, me); - else if (pPlayer->GetTeam() == HORDE) - pPlayer->GroupEventHappens(QUEST_EFTW_H, me); + if (player->GetTeam() == ALLIANCE) + player->GroupEventHappens(QUEST_EFTW_A, me); + else if (player->GetTeam() == HORDE) + player->GroupEventHappens(QUEST_EFTW_H, me); } - me->SetInFront(pPlayer); break; + me->SetInFront(player); break; case 30: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; case 31: DoCast(me, SPELL_CAT); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break; @@ -508,21 +508,21 @@ public: void JustDied(Unit* /*killer*/) { - if (Player* pPlayer = GetPlayerForEscort()) + if (Player* player = GetPlayerForEscort()) { - if (pPlayer->GetTeam() == ALLIANCE) - pPlayer->FailQuest(QUEST_EFTW_A); - else if (pPlayer->GetTeam() == HORDE) - pPlayer->FailQuest(QUEST_EFTW_H); + if (player->GetTeam() == ALLIANCE) + player->FailQuest(QUEST_EFTW_A); + else if (player->GetTeam() == HORDE) + player->FailQuest(QUEST_EFTW_H); } } }; - bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A) { - CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); creature->setFaction(113); } return true; @@ -548,45 +548,45 @@ class go_skull_pile : public GameObjectScript public: go_skull_pile() : GameObjectScript("go_skull_pile") { } - bool OnGossipSelect(Player* pPlayer, GameObject* pGo, uint32 uiSender, uint32 uiAction) + bool OnGossipSelect(Player* player, GameObject* pGo, uint32 uiSender, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch(uiSender) { - case GOSSIP_SENDER_MAIN: SendActionMenu(pPlayer, pGo, uiAction); break; + case GOSSIP_SENDER_MAIN: SendActionMenu(player, pGo, uiAction); break; } return true; } - bool OnGossipHello(Player* pPlayer, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* pGo) { - if ((pPlayer->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || pPlayer->GetQuestRewardStatus(11885)) + if ((player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(11885)) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_DARKSCREECHER_AKKARAI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_KARROG, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_GEZZARAK_THE_HUNTRESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_VAKKIZ_THE_WINDRAGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_DARKSCREECHER_AKKARAI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_KARROG, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_GEZZARAK_THE_HUNTRESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_VAKKIZ_THE_WINDRAGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); } - pPlayer->SEND_GOSSIP_MENU(pGo->GetGOInfo()->questgiver.gossipID, pGo->GetGUID()); + player->SEND_GOSSIP_MENU(pGo->GetGOInfo()->questgiver.gossipID, pGo->GetGUID()); return true; } - void SendActionMenu(Player* pPlayer, GameObject* /*pGo*/, uint32 uiAction) + void SendActionMenu(Player* player, GameObject* /*pGo*/, uint32 uiAction) { switch(uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->CastSpell(pPlayer, 40642, false); + player->CastSpell(player, 40642, false); break; case GOSSIP_ACTION_INFO_DEF + 2: - pPlayer->CastSpell(pPlayer, 40640, false); + player->CastSpell(player, 40640, false); break; case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->CastSpell(pPlayer, 40632, false); + player->CastSpell(player, 40632, false); break; case GOSSIP_ACTION_INFO_DEF + 4: - pPlayer->CastSpell(pPlayer, 40644, false); + player->CastSpell(player, 40644, false); break; } } @@ -606,24 +606,24 @@ class npc_slim : public CreatureScript public: npc_slim() : CreatureScript("npc_slim") { } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->GetSession()->SendListInventory(creature->GetGUID()); + player->GetSession()->SendListInventory(creature->GetGUID()); return true; } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isVendor() && pPlayer->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) + if (creature->isVendor() && player->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(9896, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + player->SEND_GOSSIP_MENU(9896, creature->GetGUID()); } else - pPlayer->SEND_GOSSIP_MENU(9895, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9895, creature->GetGUID()); return true; } @@ -645,14 +645,14 @@ class npc_akuno : public CreatureScript public: npc_akuno() : CreatureScript("npc_akuno") { } - bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) { if (pQuest->GetQuestId() == QUEST_ESCAPING_THE_TOMB) { if (npc_akunoAI* pEscortAI = CAST_AI(npc_akuno::npc_akunoAI, creature->AI())) - pEscortAI->Start(false, false, pPlayer->GetGUID()); + pEscortAI->Start(false, false, player->GetGUID()); - if (pPlayer->GetTeamId() == TEAM_ALLIANCE) + if (player->GetTeamId() == TEAM_ALLIANCE) creature->setFaction(FACTION_ESCORT_A_NEUTRAL_PASSIVE); else creature->setFaction(FACTION_ESCORT_H_NEUTRAL_PASSIVE); @@ -671,9 +671,9 @@ public: void WaypointReached(uint32 i) { - Player* pPlayer = GetPlayerForEscort(); + Player* player = GetPlayerForEscort(); - if (!pPlayer) + if (!player) return; switch(i) @@ -683,8 +683,8 @@ public: me->SummonCreature(NPC_CABAL_SKRIMISHER, -2793.55f, 5412.79f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 11: - if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) - pPlayer->GroupEventHappens(QUEST_ESCAPING_THE_TOMB, me); + if (player && player->GetTypeId() == TYPEID_PLAYER) + player->GroupEventHappens(QUEST_ESCAPING_THE_TOMB, me); break; } } diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 15bae699d4e..dbce64746c0 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -50,23 +50,23 @@ class npcs_ashyen_and_keleth : public CreatureScript public: npcs_ashyen_and_keleth() : CreatureScript("npcs_ashyen_and_keleth") { } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetReputationRank(942) > REP_NEUTRAL) + if (player->GetReputationRank(942) > REP_NEUTRAL) { if (creature->GetEntry() == 17900) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_ASH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_ASH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (creature->GetEntry() == 17901) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_KEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_KEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); } - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { creature->setPowerType(POWER_MANA); @@ -75,22 +75,22 @@ public: if (creature->GetEntry() == 17900) //check which Creature we are dealing with { - switch (pPlayer->GetReputationRank(942)) + switch (player->GetReputationRank(942)) { //mark of lore case REP_FRIENDLY: - creature->CastSpell(pPlayer, 31808, true); + creature->CastSpell(player, 31808, true); DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_HONORED: - creature->CastSpell(pPlayer, 31810, true); + creature->CastSpell(player, 31810, true); DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_REVERED: - creature->CastSpell(pPlayer, 31811, true); + creature->CastSpell(player, 31811, true); DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_EXALTED: - creature->CastSpell(pPlayer, 31815, true); + creature->CastSpell(player, 31815, true); DoScriptText(GOSSIP_REWARD_BLESS, creature); break; default: @@ -100,30 +100,30 @@ public: if (creature->GetEntry() == 17901) { - switch (pPlayer->GetReputationRank(942)) //mark of war + switch (player->GetReputationRank(942)) //mark of war { case REP_FRIENDLY: - creature->CastSpell(pPlayer, 31807, true); + creature->CastSpell(player, 31807, true); DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_HONORED: - creature->CastSpell(pPlayer, 31812, true); + creature->CastSpell(player, 31812, true); DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_REVERED: - creature->CastSpell(pPlayer, 31813, true); + creature->CastSpell(player, 31813, true); DoScriptText(GOSSIP_REWARD_BLESS, creature); break; case REP_EXALTED: - creature->CastSpell(pPlayer, 31814, true); + creature->CastSpell(player, 31814, true); DoScriptText(GOSSIP_REWARD_BLESS, creature); break; default: break; } } - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); + player->CLOSE_GOSSIP_MENU(); + player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); } return true; } @@ -186,23 +186,23 @@ public: return new npc_cooshcooshAI (creature); } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9441, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9441, creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF) { - pPlayer->CLOSE_GOSSIP_MENU(); + player->CLOSE_GOSSIP_MENU(); creature->setFaction(FACTION_HOSTILE_CO); - creature->AI()->AttackStart(pPlayer); + creature->AI()->AttackStart(player); } return true; } @@ -221,44 +221,44 @@ class npc_elder_kuruti : public CreatureScript public: npc_elder_kuruti() : CreatureScript("npc_elder_kuruti") { } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (pPlayer->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + if (player->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(9226, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9226, creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(9227, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(9227, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(9229, creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->SEND_GOSSIP_MENU(9229, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: { - if (!pPlayer->HasItemCount(24573, 1)) + if (!player->HasItemCount(24573, 1)) { ItemPosCountVec dest; uint32 itemId = 24573; - InventoryResult msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, 1, false); + InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, 1, false); if (msg == EQUIP_ERR_OK) { - pPlayer->StoreNewItem(dest, itemId, true); + player->StoreNewItem(dest, itemId, true); } else - pPlayer->SendEquipError(msg, NULL, NULL, itemId); + player->SendEquipError(msg, NULL, NULL, itemId); } - pPlayer->SEND_GOSSIP_MENU(9231, creature->GetGUID()); + player->SEND_GOSSIP_MENU(9231, creature->GetGUID()); break; } } @@ -274,21 +274,21 @@ class npc_mortog_steamhead : public CreatureScript public: npc_mortog_steamhead() : CreatureScript("npc_mortog_steamhead") { } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isVendor() && pPlayer->GetReputationRank(942) == REP_EXALTED) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + if (creature->isVendor() && player->GetReputationRank(942) == REP_EXALTED) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->GetSession()->SendListInventory(creature->GetGUID()); + player->GetSession()->SendListInventory(creature->GetGUID()); return true; } }; @@ -323,47 +323,47 @@ public: void WaypointReached(uint32 i) { - Player* pPlayer = GetPlayerForEscort(); + Player* player = GetPlayerForEscort(); - if (!pPlayer) + if (!player) return; switch(i) { case 4: - DoScriptText(SAY_AMBUSH1, me, pPlayer); + DoScriptText(SAY_AMBUSH1, me, player); DoSpawnCreature(NPC_SLAVEBINDER, -10.0f, -5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_SLAVEBINDER, -8.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 5: - DoScriptText(SAY_PROGRESS, me, pPlayer); + DoScriptText(SAY_PROGRESS, me, player); SetRun(); break; case 16: - DoScriptText(SAY_AMBUSH2, me, pPlayer); + DoScriptText(SAY_AMBUSH2, me, player); DoSpawnCreature(NPC_SLAVEBINDER, -10.0f, -5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_SLAVEBINDER, -8.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 17: SetRun(false); - DoScriptText(SAY_NEAR_END, me, pPlayer); + DoScriptText(SAY_NEAR_END, me, player); break; case 25: - DoScriptText(SAY_END, me, pPlayer); - pPlayer->GroupEventHappens(QUEST_ESCAPE_FROM, me); + DoScriptText(SAY_END, me, player); + player->GroupEventHappens(QUEST_ESCAPE_FROM, me); break; } } }; - bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) { if (pQuest->GetQuestId() == QUEST_ESCAPE_FROM) { - DoScriptText(SAY_START, creature, pPlayer); + DoScriptText(SAY_START, creature, player); if (npc_escortAI* pEscortAI = CAST_AI(npc_kayra_longmane::npc_kayra_longmaneAI, creature->AI())) - pEscortAI->Start(false, false, pPlayer->GetGUID()); + pEscortAI->Start(false, false, player->GetGUID()); } return true; } @@ -391,29 +391,29 @@ class npc_timothy_daniels : public CreatureScript public: npc_timothy_daniels() : CreatureScript("npc_timothy_daniels") { } - bool OnGossipHello(Player* pPlayer, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) { if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + player->PrepareQuestMenu(creature->GetGUID()); if (creature->isVendor()) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_POISONS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_POISONS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TIMOTHY_DANIELS_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TIMOTHY_DANIELS_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); return true; } - bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { - pPlayer->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, creature->GetGUID()); + player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, creature->GetGUID()); break; case GOSSIP_ACTION_TRADE: - pPlayer->GetSession()->SendListInventory(creature->GetGUID()); + player->GetSession()->SendListInventory(creature->GetGUID()); break; } |