aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/World
diff options
context:
space:
mode:
authorclick <click@gonnamakeyou.com>2011-07-02 22:52:42 +0200
committerclick <click@gonnamakeyou.com>2011-07-02 22:52:42 +0200
commit169f5da8c3120da98c01ebd8117f7aa527106206 (patch)
tree71d19f9b87cc83d705bca3cb76680c2d66446965 /src/server/scripts/World
parentf91ee24184dffcd686d60dd07a1d19da3f5da818 (diff)
Core: Cleaning up hungarian notation - Phase2: pPlayer -> player
Diffstat (limited to 'src/server/scripts/World')
-rw-r--r--src/server/scripts/World/go_scripts.cpp322
-rw-r--r--src/server/scripts/World/item_scripts.cpp98
-rw-r--r--src/server/scripts/World/npc_innkeeper.cpp40
-rw-r--r--src/server/scripts/World/npc_professions.cpp834
-rw-r--r--src/server/scripts/World/npc_taxi.cpp240
-rw-r--r--src/server/scripts/World/npcs_special.cpp604
6 files changed, 1069 insertions, 1069 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 48920f2d8b9..c98288cd976 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -65,9 +65,9 @@ class go_cat_figurine : public GameObjectScript
public:
go_cat_figurine() : GameObjectScript("go_cat_figurine") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true);
+ player->CastSpell(player, SPELL_SUMMON_GHOST_SABER, true);
return false;
}
};
@@ -80,16 +80,16 @@ class go_northern_crystal_pylon : public GameObjectScript
public:
go_northern_crystal_pylon() : GameObjectScript("go_northern_crystal_pylon") { }
- 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());
}
- if (pPlayer->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE)
- pPlayer->AreaExploredOrEventHappens(4285);
+ if (player->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE)
+ player->AreaExploredOrEventHappens(4285);
return true;
}
@@ -100,16 +100,16 @@ class go_eastern_crystal_pylon : public GameObjectScript
public:
go_eastern_crystal_pylon() : GameObjectScript("go_eastern_crystal_pylon") { }
- 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());
}
- if (pPlayer->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE)
- pPlayer->AreaExploredOrEventHappens(4287);
+ if (player->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE)
+ player->AreaExploredOrEventHappens(4287);
return true;
}
@@ -120,16 +120,16 @@ class go_western_crystal_pylon : public GameObjectScript
public:
go_western_crystal_pylon() : GameObjectScript("go_western_crystal_pylon") { }
- 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());
}
- if (pPlayer->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE)
- pPlayer->AreaExploredOrEventHappens(4288);
+ if (player->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE)
+ player->AreaExploredOrEventHappens(4288);
return true;
}
@@ -144,11 +144,11 @@ class go_barov_journal : public GameObjectScript
public:
go_barov_journal() : GameObjectScript("go_barov_journal") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086))
+ if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !player->HasSpell(26086))
{
- pPlayer->CastSpell(pPlayer, 26095, false);
+ player->CastSpell(player, 26095, false);
}
return true;
}
@@ -163,11 +163,11 @@ class go_field_repair_bot_74A : public GameObjectScript
public:
go_field_repair_bot_74A() : GameObjectScript("go_field_repair_bot_74A") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704))
+ if (player->HasSkill(SKILL_ENGINERING) && player->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !player->HasSpell(22704))
{
- pPlayer->CastSpell(pPlayer, 22864, false);
+ player->CastSpell(player, 22864, false);
}
return true;
}
@@ -187,14 +187,14 @@ class go_gilded_brazier : public GameObjectScript
public:
go_gilded_brazier() : GameObjectScript("go_gilded_brazier") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
{
- if (pPlayer->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE)
{
- if (Creature* Stillblade = pPlayer->SummonCreature(NPC_STILLBLADE, 8106.11f, -7542.06f, 151.775f, 3.02598f, TEMPSUMMON_DEAD_DESPAWN, 60000))
- Stillblade->AI()->AttackStart(pPlayer);
+ if (Creature* Stillblade = player->SummonCreature(NPC_STILLBLADE, 8106.11f, -7542.06f, 151.775f, 3.02598f, TEMPSUMMON_DEAD_DESPAWN, 60000))
+ Stillblade->AI()->AttackStart(player);
}
}
return true;
@@ -210,10 +210,10 @@ class go_orb_of_command : public GameObjectScript
public:
go_orb_of_command() : GameObjectScript("go_orb_of_command") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- if (pPlayer->GetQuestRewardStatus(7761))
- pPlayer->CastSpell(pPlayer, 23460, true);
+ if (player->GetQuestRewardStatus(7761))
+ player->CastSpell(player, 23460, true);
return true;
}
@@ -228,11 +228,11 @@ class go_tablet_of_madness : public GameObjectScript
public:
go_tablet_of_madness() : GameObjectScript("go_tablet_of_madness") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266))
+ if (player->HasSkill(SKILL_ALCHEMY) && player->GetSkillValue(SKILL_ALCHEMY) >= 300 && !player->HasSpell(24266))
{
- pPlayer->CastSpell(pPlayer, 24267, false);
+ player->CastSpell(player, 24267, false);
}
return true;
}
@@ -248,13 +248,13 @@ public:
go_tablet_of_the_seven() : GameObjectScript("go_tablet_of_the_seven") { }
//TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support.
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
if (pGO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
return true;
- if (pPlayer->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE)
- pPlayer->CastSpell(pPlayer, 15065, false);
+ if (player->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE)
+ player->CastSpell(player, 15065, false);
return true;
}
@@ -269,10 +269,10 @@ class go_jump_a_tron : public GameObjectScript
public:
go_jump_a_tron() : GameObjectScript("go_jump_a_tron") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
- pPlayer->CastSpell(pPlayer, 33382, true);
+ if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
+ player->CastSpell(player, 33382, true);
return true;
}
@@ -303,15 +303,15 @@ class go_ethereum_prison : public GameObjectScript
public:
go_ethereum_prison() : GameObjectScript("go_ethereum_prison") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
int Random = rand() % (sizeof(NpcPrisonEntry) / sizeof(uint32));
- if (Creature* creature = pPlayer->SummonCreature(NpcPrisonEntry[Random],
- pGO->GetPositionX(), pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer),
+ if (Creature* creature = player->SummonCreature(NpcPrisonEntry[Random],
+ pGO->GetPositionX(), pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(player),
TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
{
- if (!creature->IsHostileTo(pPlayer))
+ if (!creature->IsHostileTo(player))
{
uint32 Spell = 0;
@@ -328,7 +328,7 @@ public:
}
if (Spell)
- creature->CastSpell(pPlayer, Spell, false);
+ creature->CastSpell(player, Spell, false);
else
sLog->outError("TSCR: go_ethereum_prison summoned Creature (entry %u) but faction (%u) are not expected by script.", creature->GetEntry(), creature->getFaction());
}
@@ -353,12 +353,12 @@ class go_ethereum_stasis : public GameObjectScript
public:
go_ethereum_stasis() : GameObjectScript("go_ethereum_stasis") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
int Random = rand() % (sizeof(NpcStasisEntry) / sizeof(uint32));
- pPlayer->SummonCreature(NpcStasisEntry[Random],
- pGO->GetPositionX(), pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer),
+ player->SummonCreature(NpcStasisEntry[Random],
+ pGO->GetPositionX(), pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(player),
TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
return false;
@@ -379,7 +379,7 @@ class go_resonite_cask : public GameObjectScript
public:
go_resonite_cask() : GameObjectScript("go_resonite_cask") { }
- bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO)
+ bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{
if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
pGO->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000);
@@ -399,10 +399,10 @@ class go_sacred_fire_of_life : public GameObjectScript
public:
go_sacred_fire_of_life() : GameObjectScript("go_sacred_fire_of_life") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
- pPlayer->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ player->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
return true;
}
@@ -427,7 +427,7 @@ class go_shrine_of_the_birds : public GameObjectScript
public:
go_shrine_of_the_birds() : GameObjectScript("go_shrine_of_the_birds") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
uint32 BirdEntry = 0;
@@ -448,7 +448,7 @@ public:
}
if (BirdEntry)
- pPlayer->SummonCreature(BirdEntry, fX, fY, fZ, pGO->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+ player->SummonCreature(BirdEntry, fX, fY, fZ, pGO->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
return false;
}
@@ -470,13 +470,13 @@ class go_southfury_moonstone : public GameObjectScript
public:
go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
//implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose
- //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false);
+ //player->CastSpell(player, SPELL_SUMMON_RIZZLE, false);
- if (Creature* creature = pPlayer->SummonCreature(NPC_RIZZLE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0))
- creature->CastSpell(pPlayer, SPELL_BLACKJACK, false);
+ if (Creature* creature = player->SummonCreature(NPC_RIZZLE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0))
+ creature->CastSpell(player, SPELL_BLACKJACK, false);
return false;
}
@@ -498,14 +498,14 @@ class go_tele_to_dalaran_crystal : public GameObjectScript
public:
go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG))
+ if (player->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG))
{
return false;
}
else
- pPlayer->GetSession()->SendNotification(GO_TELE_TO_DALARAN_CRYSTAL_FAILED);
+ player->GetSession()->SendNotification(GO_TELE_TO_DALARAN_CRYSTAL_FAILED);
return true;
}
@@ -520,9 +520,9 @@ class go_tele_to_violet_stand : public GameObjectScript
public:
go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || player->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE)
return false;
return true;
@@ -550,38 +550,38 @@ class go_fel_crystalforge : public GameObjectScript
public:
go_fel_crystalforge() : GameObjectScript("go_fel_crystalforge") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */
- pPlayer->PrepareQuestMenu(pGO->GetGUID()); /* return true*/
+ player->PrepareQuestMenu(pGO->GetGUID()); /* return true*/
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_TEXT, pGO->GetGUID());
+ player->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_TEXT, pGO->GetGUID());
return true;
}
- 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(uiAction)
{
case GOSSIP_ACTION_INFO_DEF:
- pPlayer->CastSpell(pPlayer, SPELL_CREATE_1_FLASK_OF_BEAST, false);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
+ player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_BEAST, false);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+ player->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 1:
- pPlayer->CastSpell(pPlayer, SPELL_CREATE_5_FLASK_OF_BEAST, false);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
+ player->CastSpell(player, SPELL_CREATE_5_FLASK_OF_BEAST, false);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+ player->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 2:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_TEXT, pGO->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+ player->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_TEXT, pGO->GetGUID());
break;
}
return true;
@@ -609,38 +609,38 @@ class go_bashir_crystalforge : public GameObjectScript
public:
go_bashir_crystalforge() : GameObjectScript("go_bashir_crystalforge") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */
- pPlayer->PrepareQuestMenu(pGO->GetGUID()); /* return true*/
+ player->PrepareQuestMenu(pGO->GetGUID()); /* return true*/
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_TEXT, pGO->GetGUID());
+ player->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_TEXT, pGO->GetGUID());
return true;
}
- 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(uiAction)
{
case GOSSIP_ACTION_INFO_DEF:
- pPlayer->CastSpell(pPlayer, SPELL_CREATE_1_FLASK_OF_SORCERER, false);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
+ player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_SORCERER, false);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+ player->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 1:
- pPlayer->CastSpell(pPlayer, SPELL_CREATE_5_FLASK_OF_SORCERER, false);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
+ player->CastSpell(player, SPELL_CREATE_5_FLASK_OF_SORCERER, false);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+ player->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 2:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_TEXT, pGO->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+ player->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_TEXT, pGO->GetGUID());
break;
}
return true;
@@ -673,36 +673,36 @@ class go_matrix_punchograph : public GameObjectScript
public:
go_matrix_punchograph() : GameObjectScript("go_matrix_punchograph") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
switch(pGO->GetEntry())
{
case MATRIX_PUNCHOGRAPH_3005_A:
- if (pPlayer->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1))
+ if (player->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1))
{
- pPlayer->DestroyItemCount(ITEM_WHITE_PUNCH_CARD, 1, true);
- pPlayer->CastSpell(pPlayer, SPELL_YELLOW_PUNCH_CARD, true);
+ player->DestroyItemCount(ITEM_WHITE_PUNCH_CARD, 1, true);
+ player->CastSpell(player, SPELL_YELLOW_PUNCH_CARD, true);
}
break;
case MATRIX_PUNCHOGRAPH_3005_B:
- if (pPlayer->HasItemCount(ITEM_YELLOW_PUNCH_CARD, 1))
+ if (player->HasItemCount(ITEM_YELLOW_PUNCH_CARD, 1))
{
- pPlayer->DestroyItemCount(ITEM_YELLOW_PUNCH_CARD, 1, true);
- pPlayer->CastSpell(pPlayer, SPELL_BLUE_PUNCH_CARD, true);
+ player->DestroyItemCount(ITEM_YELLOW_PUNCH_CARD, 1, true);
+ player->CastSpell(player, SPELL_BLUE_PUNCH_CARD, true);
}
break;
case MATRIX_PUNCHOGRAPH_3005_C:
- if (pPlayer->HasItemCount(ITEM_BLUE_PUNCH_CARD, 1))
+ if (player->HasItemCount(ITEM_BLUE_PUNCH_CARD, 1))
{
- pPlayer->DestroyItemCount(ITEM_BLUE_PUNCH_CARD, 1, true);
- pPlayer->CastSpell(pPlayer, SPELL_RED_PUNCH_CARD, true);
+ player->DestroyItemCount(ITEM_BLUE_PUNCH_CARD, 1, true);
+ player->CastSpell(player, SPELL_RED_PUNCH_CARD, true);
}
break;
case MATRIX_PUNCHOGRAPH_3005_D:
- if (pPlayer->HasItemCount(ITEM_RED_PUNCH_CARD, 1))
+ if (player->HasItemCount(ITEM_RED_PUNCH_CARD, 1))
{
- pPlayer->DestroyItemCount(ITEM_RED_PUNCH_CARD, 1, true);
- pPlayer->CastSpell(pPlayer, SPELL_PRISMATIC_PUNCH_CARD, true);
+ player->DestroyItemCount(ITEM_RED_PUNCH_CARD, 1, true);
+ player->CastSpell(player, SPELL_PRISMATIC_PUNCH_CARD, true);
}
break;
default:
@@ -726,12 +726,12 @@ class go_rusty_cage : public GameObjectScript
public:
go_rusty_cage() : GameObjectScript("go_rusty_cage") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
if (Creature* pGoblinPrisoner = pGO->FindNearestCreature(NPC_GOBLIN_PRISIONER, 5.0f, true))
{
pGO->SetGoState(GO_STATE_ACTIVE);
- pPlayer->KilledMonsterCredit(NPC_GOBLIN_PRISIONER, pGoblinPrisoner->GetGUID());
+ player->KilledMonsterCredit(NPC_GOBLIN_PRISIONER, pGoblinPrisoner->GetGUID());
pGoblinPrisoner->DisappearAndDie();
}
@@ -753,12 +753,12 @@ class go_scourge_cage : public GameObjectScript
public:
go_scourge_cage() : GameObjectScript("go_scourge_cage") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
if (Creature* pNearestPrisoner = pGO->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true))
{
pGO->SetGoState(GO_STATE_ACTIVE);
- pPlayer->KilledMonsterCredit(NPC_SCOURGE_PRISONER, pNearestPrisoner->GetGUID());
+ player->KilledMonsterCredit(NPC_SCOURGE_PRISONER, pNearestPrisoner->GetGUID());
pNearestPrisoner->DisappearAndDie();
}
@@ -781,12 +781,12 @@ class go_arcane_prison : public GameObjectScript
public:
go_arcane_prison() : GameObjectScript("go_arcane_prison") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
- if (pPlayer->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE)
{
pGO->SummonCreature(25318, 3485.089844f, 6115.7422188f, 70.966812f, 0, TEMPSUMMON_TIMED_DESPAWN, 60000);
- pPlayer->CastSpell(pPlayer, SPELL_ARCANE_PRISONER_KILL_CREDIT, true);
+ player->CastSpell(player, SPELL_ARCANE_PRISONER_KILL_CREDIT, true);
return true;
} else
return false;
@@ -804,10 +804,10 @@ class go_blood_filled_orb : public GameObjectScript
public:
go_blood_filled_orb() : GameObjectScript("go_blood_filled_orb") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
- pPlayer->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ player->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
return true;
}
@@ -835,7 +835,7 @@ class go_jotunheim_cage : public GameObjectScript
public:
go_jotunheim_cage() : GameObjectScript("go_jotunheim_cage") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
Creature* pPrisoner = pGO->FindNearestCreature(NPC_EBON_BLADE_PRISONER_HUMAN, 5.0f, true);
if (!pPrisoner)
@@ -852,20 +852,20 @@ public:
return false;
pPrisoner->DisappearAndDie();
- pPlayer->KilledMonsterCredit(NPC_EBON_BLADE_PRISONER_HUMAN, 0);
+ player->KilledMonsterCredit(NPC_EBON_BLADE_PRISONER_HUMAN, 0);
switch(pPrisoner->GetEntry())
{
case NPC_EBON_BLADE_PRISONER_HUMAN:
- pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_H, true);
+ player->CastSpell(player, SPELL_SUMMON_BLADE_KNIGHT_H, true);
break;
case NPC_EBON_BLADE_PRISONER_NE:
- pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_NE, true);
+ player->CastSpell(player, SPELL_SUMMON_BLADE_KNIGHT_NE, true);
break;
case NPC_EBON_BLADE_PRISONER_TROLL:
- pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_TROLL, true);
+ player->CastSpell(player, SPELL_SUMMON_BLADE_KNIGHT_TROLL, true);
break;
case NPC_EBON_BLADE_PRISONER_ORC:
- pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_ORC, true);
+ player->CastSpell(player, SPELL_SUMMON_BLADE_KNIGHT_ORC, true);
break;
}
return true;
@@ -884,12 +884,12 @@ class go_table_theka : public GameObjectScript
public:
go_table_theka() : GameObjectScript("go_table_theka") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
- if (pPlayer->GetQuestStatus(QUEST_SPIDER_GOLD) == QUEST_STATUS_INCOMPLETE)
- pPlayer->AreaExploredOrEventHappens(QUEST_SPIDER_GOLD);
+ if (player->GetQuestStatus(QUEST_SPIDER_GOLD) == QUEST_STATUS_INCOMPLETE)
+ player->AreaExploredOrEventHappens(QUEST_SPIDER_GOLD);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_TABLE_THEKA, pGO->GetGUID());
+ player->SEND_GOSSIP_MENU(GOSSIP_TABLE_THEKA, pGO->GetGUID());
return true;
}
@@ -910,12 +910,12 @@ class go_inconspicuous_landmark : public GameObjectScript
public:
go_inconspicuous_landmark() : GameObjectScript("go_inconspicuous_landmark") { }
- bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
+ bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
- if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY, 1))
+ if (player->HasItemCount(ITEM_CUERGOS_KEY, 1))
return false;
- pPlayer->CastSpell(pPlayer, SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB, true);
+ player->CastSpell(player, SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB, true);
return true;
}
@@ -930,13 +930,13 @@ class go_soulwell : public GameObjectScript
public:
go_soulwell() : GameObjectScript("go_soulwell") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
Unit* caster = pGO->GetOwner();
if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
return true;
- if (!pPlayer->IsInSameRaidWith(static_cast<Player* >(caster)))
+ if (!player->IsInSameRaidWith(static_cast<Player* >(caster)))
return true;
// Repeating this at every use is ugly and inefficient. But as long as we don't have proper
@@ -961,7 +961,7 @@ public:
}
pGO->AddUse();
- pPlayer->CastSpell(pPlayer, newSpell, true);
+ player->CastSpell(player, newSpell, true);
return true;
}
};
@@ -985,9 +985,9 @@ class go_dragonflayer_cage : public GameObjectScript
public:
go_dragonflayer_cage() : GameObjectScript("go_dragonflayer_cage") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
- if (pPlayer->GetQuestStatus(QUEST_PRISONERS_OF_WYRMSKULL) != QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(QUEST_PRISONERS_OF_WYRMSKULL) != QUEST_STATUS_INCOMPLETE)
return true;
Creature* pPrisoner = pGO->FindNearestCreature(NPC_PRISONER_PRIEST, 2.0f);
@@ -1009,7 +1009,7 @@ public:
if (qInfo)
{
//TODO: prisoner should help player for a short period of time
- pPlayer->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0);
+ player->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0);
pPrisoner->DisappearAndDie();
}
return true;
@@ -1032,16 +1032,16 @@ class go_tadpole_cage : public GameObjectScript
public:
go_tadpole_cage() : GameObjectScript("go_tadpole_cage") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
- if (pPlayer->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE)
{
Creature* pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE, 1.0f);
if (pTadpole)
{
pGO->UseDoorOrButton();
pTadpole->DisappearAndDie();
- pPlayer->KilledMonsterCredit(NPC_WINTERFIN_TADPOLE, 0);
+ player->KilledMonsterCredit(NPC_WINTERFIN_TADPOLE, 0);
//FIX: Summon minion tadpole
}
}
@@ -1067,10 +1067,10 @@ class go_black_cage : public GameObjectScript
public:
go_black_cage() : GameObjectScript("go_black_cage") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
- if ((pPlayer->GetTeamId() == TEAM_ALLIANCE && pPlayer->GetQuestStatus(QUEST_ALLIANCE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE) ||
- (pPlayer->GetTeamId() == TEAM_HORDE && pPlayer->GetQuestStatus(QUEST_HORDE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE))
+ if ((player->GetTeamId() == TEAM_ALLIANCE && player->GetQuestStatus(QUEST_ALLIANCE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE) ||
+ (player->GetTeamId() == TEAM_HORDE && player->GetQuestStatus(QUEST_HORDE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE))
{
Creature* pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT, 1.0f);
if (!pPrisoner)
@@ -1079,7 +1079,7 @@ public:
{
pGO->UseDoorOrButton();
pPrisoner->DisappearAndDie();
- pPlayer->KilledMonsterCredit(pPrisoner->GetEntry(), 0);
+ player->KilledMonsterCredit(pPrisoner->GetEntry(), 0);
}
}
return true;
@@ -1110,41 +1110,41 @@ class go_amberpine_outhouse : public GameObjectScript
public:
go_amberpine_outhouse() : GameObjectScript("go_amberpine_outhouse") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
- QuestStatus status = pPlayer->GetQuestStatus(QUEST_DOING_YOUR_DUTY);
+ QuestStatus status = player->GetQuestStatus(QUEST_DOING_YOUR_DUTY);
if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED)
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_USE_OUTHOUSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_OUTHOUSE_VACANT, pGO->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_USE_OUTHOUSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+ player->SEND_GOSSIP_MENU(GOSSIP_OUTHOUSE_VACANT, pGO->GetGUID());
return true;
}
else
- pPlayer->SEND_GOSSIP_MENU(GOSSIP_OUTHOUSE_INUSE, pGO->GetGUID());
+ player->SEND_GOSSIP_MENU(GOSSIP_OUTHOUSE_INUSE, pGO->GetGUID());
return true;
}
- 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();
if (uiAction == GOSSIP_ACTION_INFO_DEF +1)
{
- pPlayer->CLOSE_GOSSIP_MENU();
- Creature* pTarget = GetClosestCreatureWithEntry(pPlayer, NPC_OUTHOUSE_BUNNY, 3.0f);
+ player->CLOSE_GOSSIP_MENU();
+ Creature* pTarget = GetClosestCreatureWithEntry(player, NPC_OUTHOUSE_BUNNY, 3.0f);
if (pTarget)
{
- pTarget->AI()->SetData(1, pPlayer->getGender());
+ pTarget->AI()->SetData(1, player->getGender());
pGO->CastSpell(pTarget, SPELL_INDISPOSED_III);
}
- pGO->CastSpell(pPlayer, SPELL_INDISPOSED);
- if (pPlayer->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER, 1))
- pGO->CastSpell(pPlayer, SPELL_CREATE_AMBERSEEDS);
+ pGO->CastSpell(player, SPELL_INDISPOSED);
+ if (player->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER, 1))
+ pGO->CastSpell(player, SPELL_CREATE_AMBERSEEDS);
return true;
}
else
{
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->GetSession()->SendNotification(GO_ANDERHOLS_SLIDER_CIDER_NOT_FOUND);
+ player->CLOSE_GOSSIP_MENU();
+ player->GetSession()->SendNotification(GO_ANDERHOLS_SLIDER_CIDER_NOT_FOUND);
return false;
}
}
@@ -1165,11 +1165,11 @@ class go_hive_pod : public GameObjectScript
public:
go_hive_pod() : GameObjectScript("go_hive_pod") { }
- bool OnGossipHello(Player* pPlayer, GameObject* pGO)
+ bool OnGossipHello(Player* player, GameObject* pGO)
{
- pPlayer->SendLoot(pGO->GetGUID(), LOOT_CORPSE);
- pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX()+1, pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
- pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX(), pGO->GetPositionY()+1, pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
+ player->SendLoot(pGO->GetGUID(), LOOT_CORPSE);
+ pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX()+1, pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(player), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
+ pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX(), pGO->GetPositionY()+1, pGO->GetPositionZ(), pGO->GetAngle(player), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
return true;
}
};
@@ -1179,7 +1179,7 @@ class go_massive_seaforium_charge : public GameObjectScript
public:
go_massive_seaforium_charge() : GameObjectScript("go_massive_seaforium_charge") { }
- bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo)
+ bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{
pGo->SetLootState(GO_JUST_DEACTIVATED);
return true;
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index 440a75975ff..10b0f14e632 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -48,7 +48,7 @@ class item_only_for_flight : public ItemScript
public:
item_only_for_flight() : ItemScript("item_only_for_flight") { }
- bool OnUse(Player* pPlayer, Item* pItem, SpellCastTargets const& /*targets*/)
+ bool OnUse(Player* player, Item* pItem, SpellCastTargets const& /*targets*/)
{
uint32 itemId = pItem->GetEntry();
bool disabled = false;
@@ -57,25 +57,25 @@ public:
switch(itemId)
{
case 24538:
- if (pPlayer->GetAreaId() != 3628)
+ if (player->GetAreaId() != 3628)
disabled = true;
break;
case 34489:
- if (pPlayer->GetZoneId() != 4080)
+ if (player->GetZoneId() != 4080)
disabled = true;
break;
case 34475:
if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_ARCANE_CHARGES))
- Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
+ Spell::SendCastResult(player, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
break;
}
// allow use in flight only
- if (pPlayer->isInFlight() && !disabled)
+ if (player->isInFlight() && !disabled)
return false;
// error
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL);
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL);
return true;
}
};
@@ -91,28 +91,28 @@ public:
//This is just a hack and should be removed from here.
//Creature/Item are in fact created before spell are sucessfully casted, without any checks at all to ensure proper/expected behavior.
- bool OnUse(Player* pPlayer, Item* /*pItem*/, SpellCastTargets const& /*targets*/)
+ bool OnUse(Player* player, Item* /*pItem*/, SpellCastTargets const& /*targets*/)
{
- if (pPlayer->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE)
{
if (urand(0, 99) < 35)
{
- Creature* Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
+ Creature* Murloc = player->SummonCreature(17102, player->GetPositionX(), player->GetPositionY()+20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
if (Murloc)
- Murloc->AI()->AttackStart(pPlayer);
+ Murloc->AI()->AttackStart(player);
}
else
{
ItemPosCountVec dest;
uint32 itemId = 23614;
- InventoryResult msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, 1);
+ InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, 1);
if (msg == EQUIP_ERR_OK)
{
- if (Item* item = pPlayer->StoreNewItem(dest, itemId, true))
- pPlayer->SendNewItem(item, 1, false, true);
+ if (Item* item = player->StoreNewItem(dest, itemId, true))
+ player->SendNewItem(item, 1, false, true);
}
else
- pPlayer->SendEquipError(msg, NULL, NULL, itemId);
+ player->SendEquipError(msg, NULL, NULL, itemId);
}
}
return false;
@@ -150,13 +150,13 @@ class item_gor_dreks_ointment : public ItemScript
public:
item_gor_dreks_ointment() : ItemScript("item_gor_dreks_ointment") { }
- bool OnUse(Player* pPlayer, Item* pItem, SpellCastTargets const& targets)
+ bool OnUse(Player* player, Item* pItem, SpellCastTargets const& targets)
{
if (targets.GetUnitTarget() && targets.GetUnitTarget()->GetTypeId() == TYPEID_UNIT &&
targets.GetUnitTarget()->GetEntry() == 20748 && !targets.GetUnitTarget()->HasAura(32578))
return false;
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL);
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL);
return true;
}
};
@@ -170,13 +170,13 @@ class item_incendiary_explosives : public ItemScript
public:
item_incendiary_explosives() : ItemScript("item_incendiary_explosives") { }
- bool OnUse(Player* pPlayer, Item* pItem, SpellCastTargets const & /*targets*/)
+ bool OnUse(Player* player, Item* pItem, SpellCastTargets const & /*targets*/)
{
- if (pPlayer->FindNearestCreature(26248, 15) || pPlayer->FindNearestCreature(26249, 15))
+ if (player->FindNearestCreature(26248, 15) || player->FindNearestCreature(26249, 15))
return false;
else
{
- pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
+ player->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
return true;
}
}
@@ -190,12 +190,12 @@ class item_mysterious_egg : public ItemScript
{
public:
item_mysterious_egg() : ItemScript("item_mysterious_egg") { }
- bool OnExpire(Player* pPlayer, ItemTemplate const* /*pItemProto*/)
+ bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/)
{
ItemPosCountVec dest;
- uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg
+ uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg
if (msg == EQUIP_ERR_OK)
- pPlayer->StoreNewItem(dest, 39883, true, Item::GenerateItemRandomPropertyId(39883));
+ player->StoreNewItem(dest, 39883, true, Item::GenerateItemRandomPropertyId(39883));
return true;
}
@@ -210,12 +210,12 @@ class item_disgusting_jar : public ItemScript
public:
item_disgusting_jar() : ItemScript("item_disgusting_jar") {}
- bool OnExpire(Player* pPlayer, ItemTemplate const* /*pItemProto*/)
+ bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/)
{
ItemPosCountVec dest;
- uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar
+ uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar
if (msg == EQUIP_ERR_OK)
- pPlayer->StoreNewItem(dest, 44718, true, Item::GenerateItemRandomPropertyId(44718));
+ player->StoreNewItem(dest, 44718, true, Item::GenerateItemRandomPropertyId(44718));
return true;
}
@@ -259,12 +259,12 @@ class item_pile_fake_furs : public ItemScript
public:
item_pile_fake_furs() : ItemScript("item_pile_fake_furs") { }
- bool OnUse(Player* pPlayer, Item* /*pItem*/, SpellCastTargets const & /*targets*/)
+ bool OnUse(Player* player, Item* /*pItem*/, SpellCastTargets const & /*targets*/)
{
GameObject* pGo = NULL;
for (uint8 i = 0; i < CaribouTrapsNum; ++i)
{
- pGo = pPlayer->FindNearestGameObject(CaribouTraps[i], 5.0f);
+ pGo = player->FindNearestGameObject(CaribouTraps[i], 5.0f);
if (pGo)
break;
}
@@ -278,7 +278,7 @@ public:
float x, y, z;
pGo->GetClosePoint(x, y, z, pGo->GetObjectSize() / 3, 7.0f);
pGo->SummonGameObject(GO_HIGH_QUALITY_FUR, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 0, 0, 0, 0, 1000);
- if (TempSummon* summon = pPlayer->SummonCreature(NPC_NESINGWARY_TRAPPER, x, y, z, pGo->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1000))
+ if (TempSummon* summon = player->SummonCreature(NPC_NESINGWARY_TRAPPER, x, y, z, pGo->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1000))
{
summon->SetVisible(false);
summon->SetReactState(REACT_PASSIVE);
@@ -304,17 +304,17 @@ class item_petrov_cluster_bombs : public ItemScript
public:
item_petrov_cluster_bombs() : ItemScript("item_petrov_cluster_bombs") { }
- bool OnUse(Player* pPlayer, Item* pItem, const SpellCastTargets & /*pTargets*/)
+ bool OnUse(Player* player, Item* pItem, const SpellCastTargets & /*pTargets*/)
{
- if (pPlayer->GetZoneId() != ZONE_ID_HOWLING)
+ if (player->GetZoneId() != ZONE_ID_HOWLING)
return false;
- if (!pPlayer->GetTransport() || pPlayer->GetAreaId() != AREA_ID_SHATTERED_STRAITS)
+ if (!player->GetTransport() || player->GetAreaId() != AREA_ID_SHATTERED_STRAITS)
{
- pPlayer->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
+ player->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_PETROV_BOMB))
- Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_NOT_HERE);
+ Spell::SendCastResult(player, pSpellInfo, 1, SPELL_FAILED_NOT_HERE);
return true;
}
@@ -370,25 +370,25 @@ class item_dehta_trap_smasher : public ItemScript
public:
item_dehta_trap_smasher() : ItemScript("item_dehta_trap_smasher") { }
- bool OnUse(Player* pPlayer, Item* /*pItem*/, const SpellCastTargets & /*pTargets*/)
+ bool OnUse(Player* player, Item* /*pItem*/, const SpellCastTargets & /*pTargets*/)
{
- if (pPlayer->GetQuestStatus(QUEST_CANNOT_HELP_THEMSELVES) != QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(QUEST_CANNOT_HELP_THEMSELVES) != QUEST_STATUS_INCOMPLETE)
return false;
Creature* pMammoth;
- pMammoth = pPlayer->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF, 5.0f);
+ pMammoth = player->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF, 5.0f);
if (!pMammoth)
return false;
GameObject* pTrap;
for (uint8 i = 0; i < MammothTrapsNum; ++i)
{
- pTrap = pPlayer->FindNearestGameObject(MammothTraps[i], 11.0f);
+ pTrap = player->FindNearestGameObject(MammothTraps[i], 11.0f);
if (pTrap)
{
pMammoth->AI()->DoAction(1);
pTrap->SetGoState(GO_STATE_READY);
- pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF, 0);
+ player->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF, 0);
return true;
}
}
@@ -407,18 +407,18 @@ class item_trident_of_nazjan : public ItemScript
public:
item_trident_of_nazjan() : ItemScript("item_Trident_of_Nazjan") { }
- bool OnUse(Player* pPlayer, Item* pItem, const SpellCastTargets & /*pTargets*/)
+ bool OnUse(Player* player, Item* pItem, const SpellCastTargets & /*pTargets*/)
{
- if (pPlayer->GetQuestStatus(QUEST_THE_EMISSARY) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(QUEST_THE_EMISSARY) == QUEST_STATUS_INCOMPLETE)
{
- if (Creature* pLeviroth = pPlayer->FindNearestCreature(NPC_LEVIROTH, 10.0f)) // spell range
+ if (Creature* pLeviroth = player->FindNearestCreature(NPC_LEVIROTH, 10.0f)) // spell range
{
- pLeviroth->AI()->AttackStart(pPlayer);
+ pLeviroth->AI()->AttackStart(player);
return false;
} else
- pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
+ player->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW , pItem, NULL);
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW , pItem, NULL);
return true;
}
};
@@ -434,17 +434,17 @@ class item_captured_frog : public ItemScript
public:
item_captured_frog() : ItemScript("item_captured_frog") { }
- bool OnUse(Player* pPlayer, Item* pItem, SpellCastTargets const& /*targets*/)
+ bool OnUse(Player* player, Item* pItem, SpellCastTargets const& /*targets*/)
{
- if (pPlayer->GetQuestStatus(QUEST_THE_PERFECT_SPIES) == QUEST_STATUS_INCOMPLETE)
+ if (player->GetQuestStatus(QUEST_THE_PERFECT_SPIES) == QUEST_STATUS_INCOMPLETE)
{
- if (pPlayer->FindNearestCreature(NPC_VANIRAS_SENTRY_TOTEM, 10.0f))
+ if (player->FindNearestCreature(NPC_VANIRAS_SENTRY_TOTEM, 10.0f))
return false;
else
- pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
+ player->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
}
else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL);
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL);
return true;
}
};
diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp
index b40e73090bf..55f6eaac687 100644
--- a/src/server/scripts/World/npc_innkeeper.cpp
+++ b/src/server/scripts/World/npc_innkeeper.cpp
@@ -42,52 +42,52 @@ class npc_innkeeper : public CreatureScript
public:
npc_innkeeper() : CreatureScript("npc_innkeeper") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
- if (IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED))
+ if (IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICK_OR_TREATED))
{
const char* localizedEntry;
- switch (pPlayer->GetSession()->GetSessionDbcLocale())
+ switch (player->GetSession()->GetSessionDbcLocale())
{
case LOCALE_frFR: localizedEntry = LOCALE_TRICK_OR_TREAT_2; break;
case LOCALE_deDE: localizedEntry = LOCALE_TRICK_OR_TREAT_3; break;
case LOCALE_esES: localizedEntry = LOCALE_TRICK_OR_TREAT_6; break;
case LOCALE_enUS: default: localizedEntry = LOCALE_TRICK_OR_TREAT_0;
}
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID);
}
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 (creature->isInnkeeper())
{
const char* localizedEntry;
- switch (pPlayer->GetSession()->GetSessionDbcLocale())
+ switch (player->GetSession()->GetSessionDbcLocale())
{
case LOCALE_deDE: localizedEntry = LOCALE_INNKEEPER_3; break;
case LOCALE_enUS: default: localizedEntry = LOCALE_INNKEEPER_0;
}
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_INTERACT_1, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INN);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_INTERACT_1, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INN);
}
- pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->TalkedToCreature(creature->GetEntry(), 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();
- if (uiAction == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED))
+ player->PlayerTalkClass->ClearMenus();
+ if (uiAction == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICK_OR_TREATED))
{
- pPlayer->CastSpell(pPlayer, SPELL_TRICK_OR_TREATED, true);
+ player->CastSpell(player, SPELL_TRICK_OR_TREATED, true);
if (urand(0, 1))
- pPlayer->CastSpell(pPlayer, SPELL_TREAT, true);
+ player->CastSpell(player, SPELL_TREAT, true);
else
{
uint32 trickspell = 0;
@@ -108,18 +108,18 @@ public:
case 12: trickspell = 24926; break; // Hallow's End Candy
case 13: trickspell = 24927; break; // Hallow's End Candy
}
- pPlayer->CastSpell(pPlayer, trickspell, true);
+ player->CastSpell(player, trickspell, true);
}
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CLOSE_GOSSIP_MENU();
return true;
}
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CLOSE_GOSSIP_MENU();
switch (uiAction)
{
- case GOSSIP_ACTION_TRADE: pPlayer->GetSession()->SendListInventory(creature->GetGUID()); break;
- case GOSSIP_ACTION_INN: pPlayer->SetBindPoint(creature->GetGUID()); break;
+ case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); break;
+ case GOSSIP_ACTION_INN: player->SetBindPoint(creature->GetGUID()); break;
}
return true;
}
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index e211041b2b7..60a67250efb 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -181,19 +181,19 @@ there is no difference here (except that default text is chosen with `gameobject
# formulas to calculate unlearning cost
###*/
-int32 DoLearnCost(Player* /*pPlayer*/) //tailor, alchemy
+int32 DoLearnCost(Player* /*player*/) //tailor, alchemy
{
return 200000;
}
-int32 DoHighUnlearnCost(Player* /*pPlayer*/) //tailor, alchemy
+int32 DoHighUnlearnCost(Player* /*player*/) //tailor, alchemy
{
return 1500000;
}
-int32 DoMedUnlearnCost(Player* pPlayer) //blacksmith, leatherwork
+int32 DoMedUnlearnCost(Player* player) //blacksmith, leatherwork
{
- uint8 level = pPlayer->getLevel();
+ uint8 level = player->getLevel();
if (level < 51)
return 250000;
else if (level < 66)
@@ -202,9 +202,9 @@ int32 DoMedUnlearnCost(Player* pPlayer) //blacksmith, leathe
return 1000000;
}
-int32 DoLowUnlearnCost(Player* pPlayer) //blacksmith
+int32 DoLowUnlearnCost(Player* player) //blacksmith
{
- uint8 level = pPlayer->getLevel();
+ uint8 level = player->getLevel();
if (level < 66)
return 50000;
else
@@ -215,7 +215,7 @@ int32 DoLowUnlearnCost(Player* pPlayer) //blacksmith
# unlearning related profession spells
###*/
-bool EquippedOk(Player* pPlayer, uint32 spellId)
+bool EquippedOk(Player* player, uint32 spellId)
{
SpellEntry const* spell = GetSpellStore()->LookupEntry(spellId);
@@ -231,7 +231,7 @@ bool EquippedOk(Player* pPlayer, uint32 spellId)
Item* pItem;
for (uint8 j = EQUIPMENT_SLOT_START; j < EQUIPMENT_SLOT_END; ++j)
{
- pItem = pPlayer->GetItemByPos(INVENTORY_SLOT_BAG_0, j);
+ pItem = player->GetItemByPos(INVENTORY_SLOT_BAG_0, j);
if (pItem)
if (pItem->GetTemplate()->RequiredSpell == reqSpell)
{
@@ -244,95 +244,95 @@ bool EquippedOk(Player* pPlayer, uint32 spellId)
return true;
}
-void ProfessionUnlearnSpells(Player* pPlayer, uint32 type)
+void ProfessionUnlearnSpells(Player* player, uint32 type)
{
switch (type)
{
case 36436: // S_UNLEARN_WEAPON
- pPlayer->removeSpell(36125); // Light Earthforged Blade
- pPlayer->removeSpell(36128); // Light Emberforged Hammer
- pPlayer->removeSpell(36126); // Light Skyforged Axe
+ player->removeSpell(36125); // Light Earthforged Blade
+ player->removeSpell(36128); // Light Emberforged Hammer
+ player->removeSpell(36126); // Light Skyforged Axe
break;
case 36435: // S_UNLEARN_ARMOR
- pPlayer->removeSpell(36122); // Earthforged Leggings
- pPlayer->removeSpell(36129); // Heavy Earthforged Breastplate
- pPlayer->removeSpell(36130); // Stormforged Hauberk
- pPlayer->removeSpell(34533); // Breastplate of Kings
- pPlayer->removeSpell(34529); // Nether Chain Shirt
- pPlayer->removeSpell(34534); // Bulwark of Kings
- pPlayer->removeSpell(36257); // Bulwark of the Ancient Kings
- pPlayer->removeSpell(36256); // Embrace of the Twisting Nether
- pPlayer->removeSpell(34530); // Twisting Nether Chain Shirt
- pPlayer->removeSpell(36124); // Windforged Leggings
+ player->removeSpell(36122); // Earthforged Leggings
+ player->removeSpell(36129); // Heavy Earthforged Breastplate
+ player->removeSpell(36130); // Stormforged Hauberk
+ player->removeSpell(34533); // Breastplate of Kings
+ player->removeSpell(34529); // Nether Chain Shirt
+ player->removeSpell(34534); // Bulwark of Kings
+ player->removeSpell(36257); // Bulwark of the Ancient Kings
+ player->removeSpell(36256); // Embrace of the Twisting Nether
+ player->removeSpell(34530); // Twisting Nether Chain Shirt
+ player->removeSpell(36124); // Windforged Leggings
break;
case 36441: // S_UNLEARN_HAMMER
- pPlayer->removeSpell(36262); // Dragonstrike
- pPlayer->removeSpell(34546); // Dragonmaw
- pPlayer->removeSpell(34545); // Drakefist Hammer
- pPlayer->removeSpell(36136); // Lavaforged Warhammer
- pPlayer->removeSpell(34547); // Thunder
- pPlayer->removeSpell(34567); // Deep Thunder
- pPlayer->removeSpell(36263); // Stormherald
- pPlayer->removeSpell(36137); // Great Earthforged Hammer
+ player->removeSpell(36262); // Dragonstrike
+ player->removeSpell(34546); // Dragonmaw
+ player->removeSpell(34545); // Drakefist Hammer
+ player->removeSpell(36136); // Lavaforged Warhammer
+ player->removeSpell(34547); // Thunder
+ player->removeSpell(34567); // Deep Thunder
+ player->removeSpell(36263); // Stormherald
+ player->removeSpell(36137); // Great Earthforged Hammer
break;
case 36439: // S_UNLEARN_AXE
- pPlayer->removeSpell(36260); // Wicked Edge of the Planes
- pPlayer->removeSpell(34562); // Black Planar Edge
- pPlayer->removeSpell(34541); // The Planar Edge
- pPlayer->removeSpell(36134); // Stormforged Axe
- pPlayer->removeSpell(36135); // Skyforged Great Axe
- pPlayer->removeSpell(36261); // Bloodmoon
- pPlayer->removeSpell(34543); // Lunar Crescent
- pPlayer->removeSpell(34544); // Mooncleaver
+ player->removeSpell(36260); // Wicked Edge of the Planes
+ player->removeSpell(34562); // Black Planar Edge
+ player->removeSpell(34541); // The Planar Edge
+ player->removeSpell(36134); // Stormforged Axe
+ player->removeSpell(36135); // Skyforged Great Axe
+ player->removeSpell(36261); // Bloodmoon
+ player->removeSpell(34543); // Lunar Crescent
+ player->removeSpell(34544); // Mooncleaver
break;
case 36438: // S_UNLEARN_SWORD
- pPlayer->removeSpell(36258); // Blazefury
- pPlayer->removeSpell(34537); // Blazeguard
- pPlayer->removeSpell(34535); // Fireguard
- pPlayer->removeSpell(36131); // Windforged Rapier
- pPlayer->removeSpell(36133); // Stoneforged Claymore
- pPlayer->removeSpell(34538); // Lionheart Blade
- pPlayer->removeSpell(34540); // Lionheart Champion
- pPlayer->removeSpell(36259); // Lionheart Executioner
+ player->removeSpell(36258); // Blazefury
+ player->removeSpell(34537); // Blazeguard
+ player->removeSpell(34535); // Fireguard
+ player->removeSpell(36131); // Windforged Rapier
+ player->removeSpell(36133); // Stoneforged Claymore
+ player->removeSpell(34538); // Lionheart Blade
+ player->removeSpell(34540); // Lionheart Champion
+ player->removeSpell(36259); // Lionheart Executioner
break;
case 36434: // S_UNLEARN_DRAGON
- pPlayer->removeSpell(36076); // Dragonstrike Leggings
- pPlayer->removeSpell(36079); // Golden Dragonstrike Breastplate
- pPlayer->removeSpell(35576); // Ebon Netherscale Belt
- pPlayer->removeSpell(35577); // Ebon Netherscale Bracers
- pPlayer->removeSpell(35575); // Ebon Netherscale Breastplate
- pPlayer->removeSpell(35582); // Netherstrike Belt
- pPlayer->removeSpell(35584); // Netherstrike Bracers
- pPlayer->removeSpell(35580); // Netherstrike Breastplate
+ player->removeSpell(36076); // Dragonstrike Leggings
+ player->removeSpell(36079); // Golden Dragonstrike Breastplate
+ player->removeSpell(35576); // Ebon Netherscale Belt
+ player->removeSpell(35577); // Ebon Netherscale Bracers
+ player->removeSpell(35575); // Ebon Netherscale Breastplate
+ player->removeSpell(35582); // Netherstrike Belt
+ player->removeSpell(35584); // Netherstrike Bracers
+ player->removeSpell(35580); // Netherstrike Breastplate
break;
case 36328: // S_UNLEARN_ELEMENTAL
- pPlayer->removeSpell(36074); // Blackstorm Leggings
- pPlayer->removeSpell(36077); // Primalstorm Breastplate
- pPlayer->removeSpell(35590); // Primalstrike Belt
- pPlayer->removeSpell(35591); // Primalstrike Bracers
- pPlayer->removeSpell(35589); // Primalstrike Vest
+ player->removeSpell(36074); // Blackstorm Leggings
+ player->removeSpell(36077); // Primalstorm Breastplate
+ player->removeSpell(35590); // Primalstrike Belt
+ player->removeSpell(35591); // Primalstrike Bracers
+ player->removeSpell(35589); // Primalstrike Vest
break;
case 36433: // S_UNLEARN_TRIBAL
- pPlayer->removeSpell(35585); // Windhawk Hauberk
- pPlayer->removeSpell(35587); // Windhawk Belt
- pPlayer->removeSpell(35588); // Windhawk Bracers
- pPlayer->removeSpell(36075); // Wildfeather Leggings
- pPlayer->removeSpell(36078); // Living Crystal Breastplate
+ player->removeSpell(35585); // Windhawk Hauberk
+ player->removeSpell(35587); // Windhawk Belt
+ player->removeSpell(35588); // Windhawk Bracers
+ player->removeSpell(36075); // Wildfeather Leggings
+ player->removeSpell(36078); // Living Crystal Breastplate
break;
case 41299: // S_UNLEARN_SPELLFIRE
- pPlayer->removeSpell(26752); // Spellfire Belt
- pPlayer->removeSpell(26753); // Spellfire Gloves
- pPlayer->removeSpell(26754); // Spellfire Robe
+ player->removeSpell(26752); // Spellfire Belt
+ player->removeSpell(26753); // Spellfire Gloves
+ player->removeSpell(26754); // Spellfire Robe
break;
case 41558: // S_UNLEARN_MOONCLOTH
- pPlayer->removeSpell(26760); // Primal Mooncloth Belt
- pPlayer->removeSpell(26761); // Primal Mooncloth Shoulders
- pPlayer->removeSpell(26762); // Primal Mooncloth Robe
+ player->removeSpell(26760); // Primal Mooncloth Belt
+ player->removeSpell(26761); // Primal Mooncloth Shoulders
+ player->removeSpell(26762); // Primal Mooncloth Robe
break;
case 41559: // S_UNLEARN_SHADOWEAVE
- pPlayer->removeSpell(26756); // Frozen Shadoweave Shoulders
- pPlayer->removeSpell(26757); // Frozen Shadoweave Boots
- pPlayer->removeSpell(26758); // Frozen Shadoweave Robe
+ player->removeSpell(26756); // Frozen Shadoweave Shoulders
+ player->removeSpell(26757); // Frozen Shadoweave Boots
+ player->removeSpell(26758); // Frozen Shadoweave Robe
break;
}
}
@@ -341,9 +341,9 @@ void ProfessionUnlearnSpells(Player* pPlayer, uint32 type)
# start menues alchemy
###*/
-bool HasAlchemySpell(Player* pPlayer)
+bool HasAlchemySpell(Player* player)
{
- if (pPlayer->HasSpell(S_TRANSMUTE) || pPlayer->HasSpell(S_ELIXIR) || pPlayer->HasSpell(S_POTION))
+ if (player->HasSpell(S_TRANSMUTE) || player->HasSpell(S_ELIXIR) || player->HasSpell(S_POTION))
return true;
return false;
}
@@ -353,119 +353,119 @@ class npc_prof_alchemy : public CreatureScript
public:
npc_prof_alchemy() : CreatureScript("npc_prof_alchemy") { }
- 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 (creature->isTrainer())
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
uint32 eCreature = creature->GetEntry();
- if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetBaseSkillValue(SKILL_ALCHEMY) >= 350 && pPlayer->getLevel() > 67)
+ if (player->HasSkill(SKILL_ALCHEMY) && player->GetBaseSkillValue(SKILL_ALCHEMY) >= 350 && player->getLevel() > 67)
{
- if (pPlayer->GetQuestRewardStatus(10899) || pPlayer->GetQuestRewardStatus(10902) || pPlayer->GetQuestRewardStatus(10897))
+ if (player->GetQuestRewardStatus(10899) || player->GetQuestRewardStatus(10902) || player->GetQuestRewardStatus(10897))
{
switch (eCreature)
{
case 22427: //Zarevhi
- if (!HasAlchemySpell(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 1);
- if (pPlayer->HasSpell(S_TRANSMUTE))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 4);
+ if (!HasAlchemySpell(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 1);
+ if (player->HasSpell(S_TRANSMUTE))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 4);
break;
case 19052: //Lorokeem
- if (!HasAlchemySpell(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 2);
- if (pPlayer->HasSpell(S_ELIXIR))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 5);
+ if (!HasAlchemySpell(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 2);
+ if (player->HasSpell(S_ELIXIR))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 5);
break;
case 17909: //Lauranna Thar'well
- if (!HasAlchemySpell(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 3);
- if (pPlayer->HasSpell(S_POTION))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 6);
+ if (!HasAlchemySpell(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 3);
+ if (player->HasSpell(S_POTION))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 6);
break;
}
}
}
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
- void SendActionMenu(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendActionMenu(Player* player, Creature* creature, uint32 uiAction)
{
switch(uiAction)
{
case GOSSIP_ACTION_TRADE:
- pPlayer->GetSession()->SendListInventory(creature->GetGUID());
+ player->GetSession()->SendListInventory(creature->GetGUID());
break;
case GOSSIP_ACTION_TRAIN:
- pPlayer->GetSession()->SendTrainerList(creature->GetGUID());
+ player->GetSession()->SendTrainerList(creature->GetGUID());
break;
//Learn Alchemy
case GOSSIP_ACTION_INFO_DEF + 1:
- if (!pPlayer->HasSpell(S_TRANSMUTE) && pPlayer->HasEnoughMoney(DoLearnCost(pPlayer)))
+ if (!player->HasSpell(S_TRANSMUTE) && player->HasEnoughMoney(DoLearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_LEARN_TRANSMUTE, true);
- pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
+ player->CastSpell(player, S_LEARN_TRANSMUTE, true);
+ player->ModifyMoney(-DoLearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 2:
- if (!pPlayer->HasSpell(S_ELIXIR) && pPlayer->HasEnoughMoney(DoLearnCost(pPlayer)))
+ if (!player->HasSpell(S_ELIXIR) && player->HasEnoughMoney(DoLearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_LEARN_ELIXIR, true);
- pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
+ player->CastSpell(player, S_LEARN_ELIXIR, true);
+ player->ModifyMoney(-DoLearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 3:
- if (!pPlayer->HasSpell(S_POTION) && pPlayer->HasEnoughMoney(DoLearnCost(pPlayer)))
+ if (!player->HasSpell(S_POTION) && player->HasEnoughMoney(DoLearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_LEARN_POTION, true);
- pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
+ player->CastSpell(player, S_LEARN_POTION, true);
+ player->ModifyMoney(-DoLearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
//Unlearn Alchemy
case GOSSIP_ACTION_INFO_DEF + 4:
- if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoHighUnlearnCost(player)))
{
- creature->CastSpell(pPlayer, S_UNLEARN_TRANSMUTE, true);
- pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
+ creature->CastSpell(player, S_UNLEARN_TRANSMUTE, true);
+ player->ModifyMoney(-DoHighUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 5:
- if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoHighUnlearnCost(player)))
{
- creature->CastSpell(pPlayer, S_UNLEARN_ELIXIR, true);
- pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
+ creature->CastSpell(player, S_UNLEARN_ELIXIR, true);
+ player->ModifyMoney(-DoHighUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 6:
- if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoHighUnlearnCost(player)))
{
- creature->CastSpell(pPlayer, S_UNLEARN_POTION, true);
- pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
+ creature->CastSpell(player, S_UNLEARN_POTION, true);
+ player->ModifyMoney(-DoHighUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
}
}
- void SendConfirmLearn(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendConfirmLearn(Player* player, Creature* creature, uint32 uiAction)
{
if (uiAction)
{
@@ -473,25 +473,25 @@ public:
switch(eCreature)
{
case 22427:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 19052:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 17909:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
}
}
}
- void SendConfirmUnlearn(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendConfirmUnlearn(Player* player, Creature* creature, uint32 uiAction)
{
if (uiAction)
{
@@ -499,33 +499,33 @@ public:
switch(eCreature)
{
case 22427: //Zarevhi
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 19052: //Lorokeem
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 17909: //Lauranna Thar'well
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
}
}
}
- 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(uiSender)
{
- case GOSSIP_SENDER_MAIN: SendActionMenu(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_LEARN: SendConfirmLearn(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_CHECK: SendActionMenu(pPlayer, creature, uiAction); break;
+ case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break;
+ case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break;
+ case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, uiAction); break;
+ case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, uiAction); break;
}
return true;
}
@@ -535,9 +535,9 @@ public:
# start menues blacksmith
###*/
-bool HasWeaponSub(Player* pPlayer)
+bool HasWeaponSub(Player* player)
{
- if (pPlayer->HasSpell(S_HAMMER) || pPlayer->HasSpell(S_AXE) || pPlayer->HasSpell(S_SWORD))
+ if (player->HasSpell(S_HAMMER) || player->HasSpell(S_AXE) || player->HasSpell(S_SWORD))
return true;
return false;
}
@@ -547,197 +547,197 @@ class npc_prof_blacksmith : public CreatureScript
public:
npc_prof_blacksmith() : CreatureScript("npc_prof_blacksmith") { }
- 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 (creature->isTrainer())
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
uint32 eCreature = creature->GetEntry();
//WEAPONSMITH & ARMORSMITH
- if (pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 225)
+ if (player->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 225)
{
switch (eCreature)
{
case 11145: //Myolor Sunderfury
case 11176: //Krathok Moltenfist
- if (!pPlayer->HasSpell(S_ARMOR) && !pPlayer->HasSpell(S_WEAPON) && pPlayer->GetReputationRank(REP_ARMOR) >= REP_FRIENDLY)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_LEARN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
- if (!pPlayer->HasSpell(S_WEAPON) && !pPlayer->HasSpell(S_ARMOR) && pPlayer->GetReputationRank(REP_WEAPON) >= REP_FRIENDLY)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_LEARN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+ if (!player->HasSpell(S_ARMOR) && !player->HasSpell(S_WEAPON) && player->GetReputationRank(REP_ARMOR) >= REP_FRIENDLY)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_LEARN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+ if (!player->HasSpell(S_WEAPON) && !player->HasSpell(S_ARMOR) && player->GetReputationRank(REP_WEAPON) >= REP_FRIENDLY)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_LEARN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
break;
case 11146: //Ironus Coldsteel
case 11178: //Borgosh Corebender
- if (pPlayer->HasSpell(S_WEAPON))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_UNLEARN, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 3);
+ if (player->HasSpell(S_WEAPON))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_UNLEARN, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 3);
break;
case 5164: //Grumnus Steelshaper
case 11177: //Okothos Ironrager
- if (pPlayer->HasSpell(S_ARMOR))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_UNLEARN, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 4);
+ if (player->HasSpell(S_ARMOR))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_UNLEARN, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 4);
break;
}
}
//WEAPONSMITH SPEC
- if (pPlayer->HasSpell(S_WEAPON) && pPlayer->getLevel() > 49 && pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 250)
+ if (player->HasSpell(S_WEAPON) && player->getLevel() > 49 && player->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 250)
{
switch (eCreature)
{
case 11191: //Lilith the Lithe
- if (!HasWeaponSub(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 5);
- if (pPlayer->HasSpell(S_HAMMER))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 8);
+ if (!HasWeaponSub(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 5);
+ if (player->HasSpell(S_HAMMER))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 8);
break;
case 11192: //Kilram
- if (!HasWeaponSub(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 6);
- if (pPlayer->HasSpell(S_AXE))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 9);
+ if (!HasWeaponSub(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 6);
+ if (player->HasSpell(S_AXE))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 9);
break;
case 11193: //Seril Scourgebane
- if (!HasWeaponSub(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 7);
- if (pPlayer->HasSpell(S_SWORD))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 10);
+ if (!HasWeaponSub(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 7);
+ if (player->HasSpell(S_SWORD))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 10);
break;
}
}
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
- void SendActionMenu(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendActionMenu(Player* player, Creature* creature, uint32 uiAction)
{
switch(uiAction)
{
case GOSSIP_ACTION_TRADE:
- pPlayer->GetSession()->SendListInventory(creature->GetGUID());
+ player->GetSession()->SendListInventory(creature->GetGUID());
break;
case GOSSIP_ACTION_TRAIN:
- pPlayer->GetSession()->SendTrainerList(creature->GetGUID());
+ player->GetSession()->SendTrainerList(creature->GetGUID());
break;
//Learn Armor/Weapon
case GOSSIP_ACTION_INFO_DEF + 1:
- if (!pPlayer->HasSpell(S_ARMOR))
+ if (!player->HasSpell(S_ARMOR))
{
- pPlayer->CastSpell(pPlayer, S_LEARN_ARMOR, true);
- //_Creature->CastSpell(pPlayer, S_REP_ARMOR, true);
+ player->CastSpell(player, S_LEARN_ARMOR, true);
+ //_Creature->CastSpell(player, S_REP_ARMOR, true);
}
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 2:
- if (!pPlayer->HasSpell(S_WEAPON))
+ if (!player->HasSpell(S_WEAPON))
{
- pPlayer->CastSpell(pPlayer, S_LEARN_WEAPON, true);
- //_Creature->CastSpell(pPlayer, S_REP_WEAPON, true);
+ player->CastSpell(player, S_LEARN_WEAPON, true);
+ //_Creature->CastSpell(player, S_REP_WEAPON, true);
}
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CLOSE_GOSSIP_MENU();
break;
//Unlearn Armor/Weapon
case GOSSIP_ACTION_INFO_DEF + 3:
- if (HasWeaponSub(pPlayer))
+ if (HasWeaponSub(player))
{
//unknown textID (TALK_MUST_UNLEARN_WEAPON)
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
}
- else if (EquippedOk(pPlayer, S_UNLEARN_WEAPON))
+ else if (EquippedOk(player, S_UNLEARN_WEAPON))
{
- if (pPlayer->HasEnoughMoney(DoLowUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoLowUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_WEAPON, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_WEAPON);
- pPlayer->ModifyMoney(-DoLowUnlearnCost(pPlayer));
- creature->CastSpell(pPlayer, S_REP_ARMOR, true);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, S_UNLEARN_WEAPON, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_WEAPON);
+ player->ModifyMoney(-DoLowUnlearnCost(player));
+ creature->CastSpell(player, S_REP_ARMOR, true);
+ player->CLOSE_GOSSIP_MENU();
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
}
else
{
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
}
break;
case GOSSIP_ACTION_INFO_DEF + 4:
- if (EquippedOk(pPlayer, S_UNLEARN_ARMOR))
+ if (EquippedOk(player, S_UNLEARN_ARMOR))
{
- if (pPlayer->HasEnoughMoney(DoLowUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoLowUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_ARMOR, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ARMOR);
- pPlayer->ModifyMoney(-DoLowUnlearnCost(pPlayer));
- creature->CastSpell(pPlayer, S_REP_WEAPON, true);
+ player->CastSpell(player, S_UNLEARN_ARMOR, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_ARMOR);
+ player->ModifyMoney(-DoLowUnlearnCost(player));
+ creature->CastSpell(player, S_REP_WEAPON, true);
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
//Learn Hammer/Axe/Sword
case GOSSIP_ACTION_INFO_DEF + 5:
- pPlayer->CastSpell(pPlayer, S_LEARN_HAMMER, true);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, S_LEARN_HAMMER, true);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 6:
- pPlayer->CastSpell(pPlayer, S_LEARN_AXE, true);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, S_LEARN_AXE, true);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 7:
- pPlayer->CastSpell(pPlayer, S_LEARN_SWORD, true);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, S_LEARN_SWORD, true);
+ player->CLOSE_GOSSIP_MENU();
break;
//Unlearn Hammer/Axe/Sword
case GOSSIP_ACTION_INFO_DEF + 8:
- if (EquippedOk(pPlayer, S_UNLEARN_HAMMER))
+ if (EquippedOk(player, S_UNLEARN_HAMMER))
{
- if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoMedUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_HAMMER, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_HAMMER);
- pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_HAMMER, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_HAMMER);
+ player->ModifyMoney(-DoMedUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 9:
- if (EquippedOk(pPlayer, S_UNLEARN_AXE))
+ if (EquippedOk(player, S_UNLEARN_AXE))
{
- if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoMedUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_AXE, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_AXE);
- pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_AXE, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_AXE);
+ player->ModifyMoney(-DoMedUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 10:
- if (EquippedOk(pPlayer, S_UNLEARN_SWORD))
+ if (EquippedOk(player, S_UNLEARN_SWORD))
{
- if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoMedUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_SWORD, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SWORD);
- pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_SWORD, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_SWORD);
+ player->ModifyMoney(-DoMedUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
}
}
- void SendConfirmLearn(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendConfirmLearn(Player* player, Creature* creature, uint32 uiAction)
{
if (uiAction)
{
@@ -745,25 +745,25 @@ public:
switch(eCreature)
{
case 11191:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID (TALK_HAMMER_LEARN)
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11192:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID (TALK_AXE_LEARN)
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11193:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID (TALK_SWORD_LEARN)
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
}
}
}
- void SendConfirmUnlearn(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendConfirmUnlearn(Player* player, Creature* creature, uint32 uiAction)
{
if (uiAction)
{
@@ -774,39 +774,39 @@ public:
case 11178: //Borgosh Corebender
case 5164: //Grumnus Steelshaper
case 11177: //Okothos Ironrager
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(player), false);
//unknown textID (TALK_UNLEARN_AXEORWEAPON)
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11191:
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
//unknown textID (TALK_HAMMER_UNLEARN)
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11192:
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
//unknown textID (TALK_AXE_UNLEARN)
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11193:
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
//unknown textID (TALK_SWORD_UNLEARN)
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
}
}
}
- 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(uiSender)
{
- case GOSSIP_SENDER_MAIN: SendActionMenu(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_LEARN: SendConfirmLearn(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_CHECK: SendActionMenu(pPlayer, creature, uiAction); break;
+ case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break;
+ case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break;
+ case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, uiAction); break;
+ case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, uiAction); break;
}
return true;
}
@@ -844,65 +844,65 @@ class npc_engineering_tele_trinket : public CreatureScript
public:
npc_engineering_tele_trinket() : CreatureScript("npc_engineering_tele_trinket") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
uint32 NpcTextId = 0;
std::string GossipItem;
bool CanLearn = false;
- if (pPlayer->HasSkill(SKILL_ENGINERING))
+ if (player->HasSkill(SKILL_ENGINERING))
{
switch(creature->GetEntry())
{
case NPC_ZAP:
NpcTextId = 7249;
- if (pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 260 && pPlayer->HasSpell(S_GOBLIN))
+ if (player->GetBaseSkillValue(SKILL_ENGINERING) >= 260 && player->HasSpell(S_GOBLIN))
{
- if (!pPlayer->HasSpell(SPELL_TO_EVERLOOK))
+ if (!player->HasSpell(SPELL_TO_EVERLOOK))
{
CanLearn = true;
GossipItem = GOSSIP_ITEM_ZAP;
}
- else if (pPlayer->HasSpell(SPELL_TO_EVERLOOK))
+ else if (player->HasSpell(SPELL_TO_EVERLOOK))
NpcTextId = 0;
}
break;
case NPC_JHORDY:
NpcTextId = 7251;
- if (pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 260 && pPlayer->HasSpell(S_GNOMISH))
+ if (player->GetBaseSkillValue(SKILL_ENGINERING) >= 260 && player->HasSpell(S_GNOMISH))
{
- if (!pPlayer->HasSpell(SPELL_TO_GADGET))
+ if (!player->HasSpell(SPELL_TO_GADGET))
{
CanLearn = true;
GossipItem = GOSSIP_ITEM_JHORDY;
}
- else if (pPlayer->HasSpell(SPELL_TO_GADGET))
+ else if (player->HasSpell(SPELL_TO_GADGET))
NpcTextId = 7252;
}
break;
case NPC_KABLAM:
NpcTextId = 10365;
- if (pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 350 && pPlayer->HasSpell(S_GOBLIN))
+ if (player->GetBaseSkillValue(SKILL_ENGINERING) >= 350 && player->HasSpell(S_GOBLIN))
{
- if (!pPlayer->HasSpell(SPELL_TO_AREA52))
+ if (!player->HasSpell(SPELL_TO_AREA52))
{
CanLearn = true;
GossipItem = GOSSIP_ITEM_KABLAM;
}
- else if (pPlayer->HasSpell(SPELL_TO_AREA52))
+ else if (player->HasSpell(SPELL_TO_AREA52))
NpcTextId = 0;
}
break;
case NPC_SMILES:
NpcTextId = 10363;
- if (pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 350 && pPlayer->HasSpell(S_GNOMISH))
+ if (player->GetBaseSkillValue(SKILL_ENGINERING) >= 350 && player->HasSpell(S_GNOMISH))
{
- if (!pPlayer->HasSpell(SPELL_TO_TOSHLEY))
+ if (!player->HasSpell(SPELL_TO_TOSHLEY))
{
CanLearn = true;
GossipItem = GOSSIP_ITEM_SMILES;
}
- else if (pPlayer->HasSpell(SPELL_TO_TOSHLEY))
+ else if (player->HasSpell(SPELL_TO_TOSHLEY))
NpcTextId = 0;
}
break;
@@ -910,17 +910,17 @@ public:
}
if (CanLearn)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GossipItem, creature->GetEntry(), GOSSIP_ACTION_INFO_DEF+1);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GossipItem, creature->GetEntry(), GOSSIP_ACTION_INFO_DEF+1);
- pPlayer->SEND_GOSSIP_MENU(NpcTextId ? NpcTextId : pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(NpcTextId ? NpcTextId : 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)
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CLOSE_GOSSIP_MENU();
if (uiSender != creature->GetEntry())
return true;
@@ -928,16 +928,16 @@ public:
switch(uiSender)
{
case NPC_ZAP:
- pPlayer->CastSpell(pPlayer, SPELL_LEARN_TO_EVERLOOK, false);
+ player->CastSpell(player, SPELL_LEARN_TO_EVERLOOK, false);
break;
case NPC_JHORDY:
- pPlayer->CastSpell(pPlayer, SPELL_LEARN_TO_GADGET, false);
+ player->CastSpell(player, SPELL_LEARN_TO_GADGET, false);
break;
case NPC_KABLAM:
- pPlayer->CastSpell(pPlayer, SPELL_LEARN_TO_AREA52, false);
+ player->CastSpell(player, SPELL_LEARN_TO_AREA52, false);
break;
case NPC_SMILES:
- pPlayer->CastSpell(pPlayer, SPELL_LEARN_TO_TOSHLEY, false);
+ player->CastSpell(player, SPELL_LEARN_TO_TOSHLEY, false);
break;
}
@@ -954,100 +954,100 @@ class npc_prof_leather : public CreatureScript
public:
npc_prof_leather() : CreatureScript("npc_prof_leather") { }
- 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 (creature->isTrainer())
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
uint32 eCreature = creature->GetEntry();
- if (pPlayer->HasSkill(SKILL_LEATHERWORKING) && pPlayer->GetBaseSkillValue(SKILL_LEATHERWORKING) >= 250 && pPlayer->getLevel() > 49)
+ if (player->HasSkill(SKILL_LEATHERWORKING) && player->GetBaseSkillValue(SKILL_LEATHERWORKING) >= 250 && player->getLevel() > 49)
{
switch (eCreature)
{
case 7866: //Peter Galen
case 7867: //Thorkaf Dragoneye
- if (pPlayer->HasSpell(S_DRAGON))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 1);
+ if (player->HasSpell(S_DRAGON))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 1);
break;
case 7868: //Sarah Tanner
case 7869: //Brumn Winterhoof
- if (pPlayer->HasSpell(S_ELEMENTAL))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 2);
+ if (player->HasSpell(S_ELEMENTAL))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 2);
break;
case 7870: //Caryssia Moonhunter
case 7871: //Se'Jib
- if (pPlayer->HasSpell(S_TRIBAL))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 3);
+ if (player->HasSpell(S_TRIBAL))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 3);
break;
}
}
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
- void SendActionMenu(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendActionMenu(Player* player, Creature* creature, uint32 uiAction)
{
switch(uiAction)
{
case GOSSIP_ACTION_TRADE:
- pPlayer->GetSession()->SendListInventory(creature->GetGUID());
+ player->GetSession()->SendListInventory(creature->GetGUID());
break;
case GOSSIP_ACTION_TRAIN:
- pPlayer->GetSession()->SendTrainerList(creature->GetGUID());
+ player->GetSession()->SendTrainerList(creature->GetGUID());
break;
//Unlearn Leather
case GOSSIP_ACTION_INFO_DEF + 1:
- if (EquippedOk(pPlayer, S_UNLEARN_DRAGON))
+ if (EquippedOk(player, S_UNLEARN_DRAGON))
{
- if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoMedUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_DRAGON, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_DRAGON);
- pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_DRAGON, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_DRAGON);
+ player->ModifyMoney(-DoMedUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 2:
- if (EquippedOk(pPlayer, S_UNLEARN_ELEMENTAL))
+ if (EquippedOk(player, S_UNLEARN_ELEMENTAL))
{
- if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoMedUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_ELEMENTAL, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ELEMENTAL);
- pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_ELEMENTAL, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_ELEMENTAL);
+ player->ModifyMoney(-DoMedUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 3:
- if (EquippedOk(pPlayer, S_UNLEARN_TRIBAL))
+ if (EquippedOk(player, S_UNLEARN_TRIBAL))
{
- if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoMedUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_TRIBAL, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_TRIBAL);
- pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_TRIBAL, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_TRIBAL);
+ player->ModifyMoney(-DoMedUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
}
}
- void SendConfirmUnlearn(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendConfirmUnlearn(Player* player, Creature* creature, uint32 uiAction)
{
if (uiAction)
{
@@ -1056,34 +1056,34 @@ public:
{
case 7866: //Peter Galen
case 7867: //Thorkaf Dragoneye
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 7868: //Sarah Tanner
case 7869: //Brumn Winterhoof
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 7870: //Caryssia Moonhunter
case 7871: //Se'Jib
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
}
}
}
- 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(uiSender)
{
- case GOSSIP_SENDER_MAIN: SendActionMenu(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_CHECK: SendActionMenu(pPlayer, creature, uiAction); break;
+ case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break;
+ case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, uiAction); break;
+ case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, uiAction); break;
}
return true;
}
@@ -1093,9 +1093,9 @@ public:
# start menues tailoring
###*/
-bool HasTailorSpell(Player* pPlayer)
+bool HasTailorSpell(Player* player)
{
- if (pPlayer->HasSpell(S_MOONCLOTH) || pPlayer->HasSpell(S_SHADOWEAVE) || pPlayer->HasSpell(S_SPELLFIRE))
+ if (player->HasSpell(S_MOONCLOTH) || player->HasSpell(S_SHADOWEAVE) || player->HasSpell(S_SPELLFIRE))
return true;
return false;
}
@@ -1105,134 +1105,134 @@ class npc_prof_tailor : public CreatureScript
public:
npc_prof_tailor() : CreatureScript("npc_prof_tailor") { }
- 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 (creature->isTrainer())
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
uint32 eCreature = creature->GetEntry();
//TAILORING SPEC
- if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 350 && pPlayer->getLevel() > 59)
+ if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 350 && player->getLevel() > 59)
{
- if (pPlayer->GetQuestRewardStatus(10831) || pPlayer->GetQuestRewardStatus(10832) || pPlayer->GetQuestRewardStatus(10833))
+ if (player->GetQuestRewardStatus(10831) || player->GetQuestRewardStatus(10832) || player->GetQuestRewardStatus(10833))
{
switch (eCreature)
{
case 22213: //Gidge Spellweaver
- if (!HasTailorSpell(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 1);
- if (pPlayer->HasSpell(S_SPELLFIRE))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 4);
+ if (!HasTailorSpell(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 1);
+ if (player->HasSpell(S_SPELLFIRE))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 4);
break;
case 22208: //Nasmara Moonsong
- if (!HasTailorSpell(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 2);
- if (pPlayer->HasSpell(S_MOONCLOTH))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 5);
+ if (!HasTailorSpell(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 2);
+ if (player->HasSpell(S_MOONCLOTH))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 5);
break;
case 22212: //Andrion Darkspinner
- if (!HasTailorSpell(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 3);
- if (pPlayer->HasSpell(S_SHADOWEAVE))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 6);
+ if (!HasTailorSpell(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 3);
+ if (player->HasSpell(S_SHADOWEAVE))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 6);
break;
}
}
}
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
- void SendActionMenu(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendActionMenu(Player* player, Creature* creature, uint32 uiAction)
{
switch(uiAction)
{
case GOSSIP_ACTION_TRADE:
- pPlayer->GetSession()->SendListInventory(creature->GetGUID());
+ player->GetSession()->SendListInventory(creature->GetGUID());
break;
case GOSSIP_ACTION_TRAIN:
- pPlayer->GetSession()->SendTrainerList(creature->GetGUID());
+ player->GetSession()->SendTrainerList(creature->GetGUID());
break;
//Learn Tailor
case GOSSIP_ACTION_INFO_DEF + 1:
- if (!pPlayer->HasSpell(S_SPELLFIRE) && pPlayer->HasEnoughMoney(DoLearnCost(pPlayer)))
+ if (!player->HasSpell(S_SPELLFIRE) && player->HasEnoughMoney(DoLearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_LEARN_SPELLFIRE, true);
- pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
+ player->CastSpell(player, S_LEARN_SPELLFIRE, true);
+ player->ModifyMoney(-DoLearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 2:
- if (!pPlayer->HasSpell(S_MOONCLOTH) && pPlayer->HasEnoughMoney(DoLearnCost(pPlayer)))
+ if (!player->HasSpell(S_MOONCLOTH) && player->HasEnoughMoney(DoLearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_LEARN_MOONCLOTH, true);
- pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
+ player->CastSpell(player, S_LEARN_MOONCLOTH, true);
+ player->ModifyMoney(-DoLearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 3:
- if (!pPlayer->HasSpell(S_SHADOWEAVE) && pPlayer->HasEnoughMoney(DoLearnCost(pPlayer)))
+ if (!player->HasSpell(S_SHADOWEAVE) && player->HasEnoughMoney(DoLearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_LEARN_SHADOWEAVE, true);
- pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
+ player->CastSpell(player, S_LEARN_SHADOWEAVE, true);
+ player->ModifyMoney(-DoLearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->CLOSE_GOSSIP_MENU();
break;
//Unlearn Tailor
case GOSSIP_ACTION_INFO_DEF + 4:
- if (EquippedOk(pPlayer, S_UNLEARN_SPELLFIRE))
+ if (EquippedOk(player, S_UNLEARN_SPELLFIRE))
{
- if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoHighUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_SPELLFIRE, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SPELLFIRE);
- pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_SPELLFIRE, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_SPELLFIRE);
+ player->ModifyMoney(-DoHighUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 5:
- if (EquippedOk(pPlayer, S_UNLEARN_MOONCLOTH))
+ if (EquippedOk(player, S_UNLEARN_MOONCLOTH))
{
- if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoHighUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_MOONCLOTH, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_MOONCLOTH);
- pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_MOONCLOTH, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_MOONCLOTH);
+ player->ModifyMoney(-DoHighUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
case GOSSIP_ACTION_INFO_DEF + 6:
- if (EquippedOk(pPlayer, S_UNLEARN_SHADOWEAVE))
+ if (EquippedOk(player, S_UNLEARN_SHADOWEAVE))
{
- if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
+ if (player->HasEnoughMoney(DoHighUnlearnCost(player)))
{
- pPlayer->CastSpell(pPlayer, S_UNLEARN_SHADOWEAVE, true);
- ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SHADOWEAVE);
- pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
+ player->CastSpell(player, S_UNLEARN_SHADOWEAVE, true);
+ ProfessionUnlearnSpells(player, S_UNLEARN_SHADOWEAVE);
+ player->ModifyMoney(-DoHighUnlearnCost(player));
} else
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0);
} else
- pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+ player->CLOSE_GOSSIP_MENU();
break;
}
}
- void SendConfirmLearn(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendConfirmLearn(Player* player, Creature* creature, uint32 uiAction)
{
if (uiAction)
{
@@ -1240,25 +1240,25 @@ public:
switch(eCreature)
{
case 22213:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 22208:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 22212:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
}
}
}
- void SendConfirmUnlearn(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendConfirmUnlearn(Player* player, Creature* creature, uint32 uiAction)
{
if (uiAction)
{
@@ -1266,33 +1266,33 @@ public:
switch(eCreature)
{
case 22213: //Gidge Spellweaver
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 22208: //Nasmara Moonsong
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 22212: //Andrion Darkspinner
- pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false);
+ player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
- pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
+ player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
}
}
}
- 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(uiSender)
{
- case GOSSIP_SENDER_MAIN: SendActionMenu(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_LEARN: SendConfirmLearn(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(pPlayer, creature, uiAction); break;
- case GOSSIP_SENDER_CHECK: SendActionMenu(pPlayer, creature, uiAction); break;
+ case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break;
+ case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break;
+ case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, uiAction); break;
+ case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, uiAction); break;
}
return true;
}
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index b4035d755dd..3bf33066189 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -63,262 +63,262 @@ class npc_taxi : public CreatureScript
public:
npc_taxi() : CreatureScript("npc_taxi") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
- pPlayer->PrepareQuestMenu(creature->GetGUID());
+ player->PrepareQuestMenu(creature->GetGUID());
switch(creature->GetEntry())
{
case 17435: // Azuremyst Isle - Susurrus
- if (pPlayer->HasItemCount(23843, 1, true))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SUSURRUS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+ if (player->HasItemCount(23843, 1, true))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SUSURRUS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
break;
case 20903: // Netherstorm - Protectorate Nether Drake
- if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778, 1))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NETHER_DRAKE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+ if (player->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(29778, 1))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NETHER_DRAKE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
break;
case 18725: // Old Hillsbrad Foothills - Brazen
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BRAZEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BRAZEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
break;
case 29154: // Stormwind City - Thargold Ironwing
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_IRONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_IRONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
break;
case 19409: // Hellfire Peninsula - Wing Commander Dabir'ee
//Mission: The Murketh and Shaadraz Gateways
- if (pPlayer->GetQuestStatus(10146) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DABIREE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+ if (player->GetQuestStatus(10146) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DABIREE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
//Shatter Point
- if (!pPlayer->GetQuestRewardStatus(10340))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DABIREE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+ if (!player->GetQuestRewardStatus(10340))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DABIREE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
break;
case 20235: // Hellfire Peninsula - Gryphoneer Windbellow
//Mission: The Abyssal Shelf || Return to the Abyssal Shelf
- if (pPlayer->GetQuestStatus(10163) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10346) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WINDBELLOW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+ if (player->GetQuestStatus(10163) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10346) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WINDBELLOW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
//Go to the Front
- if (pPlayer->GetQuestStatus(10382) != QUEST_STATUS_NONE && !pPlayer->GetQuestRewardStatus(10382))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WINDBELLOW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+ if (player->GetQuestStatus(10382) != QUEST_STATUS_NONE && !player->GetQuestRewardStatus(10382))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WINDBELLOW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
break;
case 19401: // Hellfire Peninsula - Wing Commander Brack
//Mission: The Murketh and Shaadraz Gateways
- if (pPlayer->GetQuestStatus(10129) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BRACK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+ if (player->GetQuestStatus(10129) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BRACK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
//Mission: The Abyssal Shelf || Return to the Abyssal Shelf
- if (pPlayer->GetQuestStatus(10162) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10347) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BRACK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+ if (player->GetQuestStatus(10162) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10347) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BRACK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
//Spinebreaker Post
- if (pPlayer->GetQuestStatus(10242) == QUEST_STATUS_COMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BRACK3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+ if (player->GetQuestStatus(10242) == QUEST_STATUS_COMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BRACK3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
break;
case 23413: // Blade's Edge Mountains - Skyguard Handler Irena
- if (pPlayer->GetReputationRank(1031) >= REP_HONORED)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_IRENA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+ if (player->GetReputationRank(1031) >= REP_HONORED)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_IRENA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
break;
case 25059: // Isle of Quel'Danas - Ayren Cloudbreaker
- if (pPlayer->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CLOUDBREAKER1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+ if (player->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CLOUDBREAKER1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
- if (pPlayer->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CLOUDBREAKER2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+ if (player->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CLOUDBREAKER2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
break;
case 25236: // Isle of Quel'Danas - Unrestrained Dragonhawk
- if (pPlayer->GetQuestStatus(11542) == QUEST_STATUS_COMPLETE || pPlayer->GetQuestStatus(11543) == QUEST_STATUS_COMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DRAGONHAWK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
+ if (player->GetQuestStatus(11542) == QUEST_STATUS_COMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_COMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DRAGONHAWK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
break;
case 20162: // Netherstorm - Veronia
//Behind Enemy Lines
- if (pPlayer->GetQuestStatus(10652) != QUEST_STATUS_REWARDED)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_VERONIA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
+ if (player->GetQuestStatus(10652) != QUEST_STATUS_REWARDED)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_VERONIA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
break;
case 23415: // Terokkar Forest - Skyguard Handler Deesak
- if (pPlayer->GetReputationRank(1031) >= REP_HONORED)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEESAK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 16);
+ if (player->GetReputationRank(1031) >= REP_HONORED)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEESAK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 16);
break;
case 27575: // Dragonblight - Lord Afrasastrasz
// middle -> ground
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_AFRASASTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 17);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_AFRASASTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 17);
// middle -> top
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_AFRASASTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 18);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_AFRASASTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 18);
break;
case 26443: // Dragonblight - Tariolstrasz //need to check if quests are required before gossip available (12123, 12124)
// ground -> top
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TARIOLSTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 19);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TARIOLSTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 19);
// ground -> middle
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TARIOLSTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TARIOLSTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20);
break;
case 26949: // Dragonblight - Torastrasza
// top -> middle
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TORASTRASZA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TORASTRASZA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
// top -> ground
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TORASTRASZA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TORASTRASZA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
break;
case 23816: // Howling Fjord - Bat Handler Camille
- if (!pPlayer->GetQuestRewardStatus(11229))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CAMILLE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
- if (pPlayer->GetQuestStatus(11170) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CAMILLE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
+ if (!player->GetQuestRewardStatus(11229))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CAMILLE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
+ if (player->GetQuestStatus(11170) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CAMILLE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
break;
case 23704: // Dustwallow Marsh - Cassa Crimsonwing
- if (pPlayer->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25);
+ if (player->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25);
break;
case 26602:
if (creature->isTaxi())
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TAXI, GOSSIP_THRICESTAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TAXI, GOSSIP_THRICESTAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
- if (pPlayer->GetQuestStatus(11692) == QUEST_STATUS_COMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_THRICESTAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 27);
+ if (player->GetQuestStatus(11692) == QUEST_STATUS_COMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_THRICESTAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 27);
break;
case 17209:
- pPlayer->SetTaxiCheater(true);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 28);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 29);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 30);
+ player->SetTaxiCheater(true);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 28);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 29);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 30);
break;
}
- 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();
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF:
//spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506.
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 32474, true);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 32474, true);
break;
case GOSSIP_ACTION_INFO_DEF + 1:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155))
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155))
break;
case GOSSIP_ACTION_INFO_DEF + 2:
- if (!pPlayer->HasItemCount(25853, 1)) {
- pPlayer->SEND_GOSSIP_MENU(9780, creature->GetGUID());
+ if (!player->HasItemCount(25853, 1)) {
+ player->SEND_GOSSIP_MENU(9780, creature->GetGUID());
} else {
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(534); //TaxiPath 534
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(534); //TaxiPath 534
}
break;
case GOSSIP_ACTION_INFO_DEF + 3:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 53335, true); //TaxiPath 1041 (Stormwind Harbor)
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 53335, true); //TaxiPath 1041 (Stormwind Harbor)
break;
case GOSSIP_ACTION_INFO_DEF + 4:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 33768, true); //TaxiPath 585 (Gateways Murket and Shaadraz)
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 33768, true); //TaxiPath 585 (Gateways Murket and Shaadraz)
break;
case GOSSIP_ACTION_INFO_DEF + 5:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 35069, true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 35069, true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
break;
case GOSSIP_ACTION_INFO_DEF + 6:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 33899, true); //TaxiPath 589 (Aerial Assault Flight (Alliance))
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 33899, true); //TaxiPath 589 (Aerial Assault Flight (Alliance))
break;
case GOSSIP_ACTION_INFO_DEF + 7:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 35065, true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 35065, true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
break;
case GOSSIP_ACTION_INFO_DEF + 8:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 33659, true); //TaxiPath 584 (Gateways Murket and Shaadraz)
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 33659, true); //TaxiPath 584 (Gateways Murket and Shaadraz)
break;
case GOSSIP_ACTION_INFO_DEF + 9:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 33825, true); //TaxiPath 587 (Aerial Assault Flight (Horde))
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 33825, true); //TaxiPath 587 (Aerial Assault Flight (Horde))
break;
case GOSSIP_ACTION_INFO_DEF + 10:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 34578, true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 34578, true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
break;
case GOSSIP_ACTION_INFO_DEF + 11:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 41278, true); //TaxiPath 706
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 41278, true); //TaxiPath 706
break;
case GOSSIP_ACTION_INFO_DEF + 12:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 45071, true); //TaxiPath 779
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 45071, true); //TaxiPath 779
break;
case GOSSIP_ACTION_INFO_DEF + 13:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 45113, true); //TaxiPath 784
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 45113, true); //TaxiPath 784
break;
case GOSSIP_ACTION_INFO_DEF + 14:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 45353, true); //TaxiPath 788
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 45353, true); //TaxiPath 788
break;
case GOSSIP_ACTION_INFO_DEF + 15:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 34905, true); //TaxiPath 606
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 34905, true); //TaxiPath 606
break;
case GOSSIP_ACTION_INFO_DEF + 16:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 41279, true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 41279, true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
break;
case GOSSIP_ACTION_INFO_DEF + 17:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(882);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(882);
break;
case GOSSIP_ACTION_INFO_DEF + 18:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(881);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(881);
break;
case GOSSIP_ACTION_INFO_DEF + 19:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(878);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(878);
break;
case GOSSIP_ACTION_INFO_DEF + 20:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(883);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(883);
break;
case GOSSIP_ACTION_INFO_DEF + 21:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(880);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(880);
break;
case GOSSIP_ACTION_INFO_DEF + 22:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(879);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(879);
break;
case GOSSIP_ACTION_INFO_DEF + 23:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 43074, true); //TaxiPath 736
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 43074, true); //TaxiPath 736
break;
case GOSSIP_ACTION_INFO_DEF + 24:
- pPlayer->CLOSE_GOSSIP_MENU();
- //pPlayer->ActivateTaxiPathTo(738);
- pPlayer->CastSpell(pPlayer, 43136, false);
+ player->CLOSE_GOSSIP_MENU();
+ //player->ActivateTaxiPathTo(738);
+ player->CastSpell(player, 43136, false);
break;
case GOSSIP_ACTION_INFO_DEF + 25:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 42295, true);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 42295, true);
break;
case GOSSIP_ACTION_INFO_DEF + 26:
- pPlayer->GetSession()->SendTaxiMenu(creature);
+ player->GetSession()->SendTaxiMenu(creature);
break;
case GOSSIP_ACTION_INFO_DEF + 27:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 51446, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 51446, false);
break;
case GOSSIP_ACTION_INFO_DEF + 28:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(494);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(494);
break;
case GOSSIP_ACTION_INFO_DEF + 29:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(495);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(495);
break;
case GOSSIP_ACTION_INFO_DEF + 30:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->ActivateTaxiPathTo(496);
+ player->CLOSE_GOSSIP_MENU();
+ player->ActivateTaxiPathTo(496);
break;
}
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index a1620a3975f..87f5c979364 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -181,10 +181,10 @@ public:
if (pWho->isTargetableForAttack() && me->IsHostileTo(pWho))
{
- Player* pPlayerTarget = pWho->GetTypeId() == TYPEID_PLAYER ? CAST_PLR(pWho) : NULL;
+ Player* playerTarget = pWho->GetTypeId() == TYPEID_PLAYER ? CAST_PLR(pWho) : NULL;
// airforce guards only spawn for players
- if (!pPlayerTarget)
+ if (!playerTarget)
return;
Creature* pLastSpawnedGuard = m_uiSpawnedGUID == 0 ? NULL : GetSummonedGuard();
@@ -242,7 +242,7 @@ public:
return;
// ROOFTOP only triggers if the player is on the ground
- if (!pPlayerTarget->IsFlying())
+ if (!playerTarget->IsFlying())
{
if (!pLastSpawnedGuard->getVictim())
pLastSpawnedGuard->AI()->AttackStart(pWho);
@@ -280,22 +280,22 @@ class npc_lunaclaw_spirit : public CreatureScript
public:
npc_lunaclaw_spirit() : CreatureScript("npc_lunaclaw_spirit") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
- if (pPlayer->GetQuestStatus(QUEST_BODY_HEART_A) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_BODY_HEART_H) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GRANT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ if (player->GetQuestStatus(QUEST_BODY_HEART_A) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_BODY_HEART_H) == QUEST_STATUS_INCOMPLETE)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GRANT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
- pPlayer->SEND_GOSSIP_MENU(TEXT_ID_DEFAULT, creature->GetGUID());
+ player->SEND_GOSSIP_MENU(TEXT_ID_DEFAULT, 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)
{
- pPlayer->SEND_GOSSIP_MENU(TEXT_ID_PROGRESS, creature->GetGUID());
- pPlayer->AreaExploredOrEventHappens(pPlayer->GetTeam() == ALLIANCE ? QUEST_BODY_HEART_A : QUEST_BODY_HEART_H);
+ player->SEND_GOSSIP_MENU(TEXT_ID_PROGRESS, creature->GetGUID());
+ player->AreaExploredOrEventHappens(player->GetTeam() == ALLIANCE ? QUEST_BODY_HEART_A : QUEST_BODY_HEART_H);
}
return true;
}
@@ -348,12 +348,12 @@ public:
DoMeleeAttackIfReady();
}
- void ReceiveEmote(Player* pPlayer, uint32 emote)
+ void ReceiveEmote(Player* player, uint32 emote)
{
switch(emote)
{
case TEXT_EMOTE_CHICKEN:
- if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1)
+ if (player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1)
{
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->setFaction(FACTION_FRIENDLY);
@@ -361,7 +361,7 @@ public:
}
break;
case TEXT_EMOTE_CHEER:
- if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE)
+ if (player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE)
{
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->setFaction(FACTION_FRIENDLY);
@@ -377,7 +377,7 @@ public:
return new npc_chicken_cluckAI(creature);
}
- bool OnQuestAccept(Player* /*pPlayer*/, Creature* creature, const Quest *_Quest)
+ bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest *_Quest)
{
if (_Quest->GetQuestId() == QUEST_CLUCK)
CAST_AI(npc_chicken_cluck::npc_chicken_cluckAI, creature->AI())->Reset();
@@ -385,7 +385,7 @@ public:
return true;
}
- bool OnQuestComplete(Player* /*pPlayer*/, Creature* creature, const Quest *_Quest)
+ bool OnQuestComplete(Player* /*player*/, Creature* creature, const Quest *_Quest)
{
if (_Quest->GetQuestId() == QUEST_CLUCK)
CAST_AI(npc_chicken_cluck::npc_chicken_cluckAI, creature->AI())->Reset();
@@ -445,11 +445,11 @@ public:
void EnterCombat(Unit* /*who*/){}
- void ReceiveEmote(Player* pPlayer, uint32 emote)
+ void ReceiveEmote(Player* player, uint32 emote)
{
- if (me->IsWithinLOS(pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ()) && me->IsWithinDistInMap(pPlayer, 30.0f))
+ if (me->IsWithinLOS(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()) && me->IsWithinDistInMap(player, 30.0f))
{
- me->SetInFront(pPlayer);
+ me->SetInFront(player);
active = false;
WorldPacket data;
@@ -463,8 +463,8 @@ public:
case TEXT_EMOTE_JOKE: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break;
case TEXT_EMOTE_DANCE:
{
- if (!pPlayer->HasAura(SPELL_SEDUCTION))
- DoCast(pPlayer, SPELL_SEDUCTION, true);
+ if (!player->HasAura(SPELL_SEDUCTION))
+ DoCast(player, SPELL_SEDUCTION, true);
}
break;
}
@@ -583,9 +583,9 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
- void BeginEvent(Player* pPlayer)
+ void BeginEvent(Player* player)
{
- PlayerGUID = pPlayer->GetGUID();
+ PlayerGUID = player->GetGUID();
SummonPatient_Timer = 10000;
SummonPatientCount = 0;
@@ -610,17 +610,17 @@ public:
void PatientDied(Location* Point)
{
- Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
- if (pPlayer && ((pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)))
+ Player* player = Unit::GetPlayer(*me, PlayerGUID);
+ if (player && ((player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)))
{
++PatientDiedCount;
if (PatientDiedCount > 5 && Event)
{
- if (pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
- pPlayer->FailQuest(6624);
- else if (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
- pPlayer->FailQuest(6622);
+ if (player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
+ player->FailQuest(6624);
+ else if (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
+ player->FailQuest(6622);
Reset();
return;
@@ -633,11 +633,11 @@ public:
Reset();
}
- void PatientSaved(Creature* /*soldier*/, Player* pPlayer, Location* Point)
+ void PatientSaved(Creature* /*soldier*/, Player* player, Location* Point)
{
- if (pPlayer && PlayerGUID == pPlayer->GetGUID())
+ if (player && PlayerGUID == player->GetGUID())
{
- if ((pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))
+ if ((player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))
{
++PatientSavedCount;
@@ -653,10 +653,10 @@ public:
}
}
- if (pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
- pPlayer->AreaExploredOrEventHappens(6624);
- else if (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
- pPlayer->AreaExploredOrEventHappens(6622);
+ if (player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
+ player->AreaExploredOrEventHappens(6624);
+ else if (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
+ player->AreaExploredOrEventHappens(6622);
Reset();
return;
@@ -672,10 +672,10 @@ public:
void EnterCombat(Unit* /*who*/){}
};
- bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest)
+ bool OnQuestAccept(Player* player, Creature* creature, Quest const *quest)
{
if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622))
- CAST_AI(npc_doctor::npc_doctorAI, creature->AI())->BeginEvent(pPlayer);
+ CAST_AI(npc_doctor::npc_doctorAI, creature->AI())->BeginEvent(player);
return true;
}
@@ -1136,26 +1136,26 @@ class npc_kingdom_of_dalaran_quests : public CreatureScript
{
public:
npc_kingdom_of_dalaran_quests() : CreatureScript("npc_kingdom_of_dalaran_quests") { }
- 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->HasItemCount(ITEM_KT_SIGNET, 1) && (!pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_A) ||
- !pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_H) || !pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_N)))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT_TO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ if (player->HasItemCount(ITEM_KT_SIGNET, 1) && (!player->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_A) ||
+ !player->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_H) || !player->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_N)))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT_TO, 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)
{
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_TELEPORT_DALARAN, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_TELEPORT_DALARAN, false);
}
return true;
}
@@ -1170,15 +1170,15 @@ class npc_mount_vendor : public CreatureScript
public:
npc_mount_vendor() : CreatureScript("npc_mount_vendor") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
- pPlayer->PrepareQuestMenu(creature->GetGUID());
+ player->PrepareQuestMenu(creature->GetGUID());
bool canBuy;
canBuy = false;
uint32 vendor = creature->GetEntry();
- uint8 race = pPlayer->getRace();
+ uint8 race = player->getRace();
switch (vendor)
{
@@ -1186,53 +1186,53 @@ public:
case 1460: //Unger Statforth
case 2357: //Merideth Carlson
case 4885: //Gregor MacVince
- if (pPlayer->GetReputationRank(72) != REP_EXALTED && race != RACE_HUMAN)
- pPlayer->SEND_GOSSIP_MENU(5855, creature->GetGUID());
+ if (player->GetReputationRank(72) != REP_EXALTED && race != RACE_HUMAN)
+ player->SEND_GOSSIP_MENU(5855, creature->GetGUID());
else canBuy = true;
break;
case 1261: //Veron Amberstill
- if (pPlayer->GetReputationRank(47) != REP_EXALTED && race != RACE_DWARF)
- pPlayer->SEND_GOSSIP_MENU(5856, creature->GetGUID());
+ if (player->GetReputationRank(47) != REP_EXALTED && race != RACE_DWARF)
+ player->SEND_GOSSIP_MENU(5856, creature->GetGUID());
else canBuy = true;
break;
case 3362: //Ogunaro Wolfrunner
- if (pPlayer->GetReputationRank(76) != REP_EXALTED && race != RACE_ORC)
- pPlayer->SEND_GOSSIP_MENU(5841, creature->GetGUID());
+ if (player->GetReputationRank(76) != REP_EXALTED && race != RACE_ORC)
+ player->SEND_GOSSIP_MENU(5841, creature->GetGUID());
else canBuy = true;
break;
case 3685: //Harb Clawhoof
- if (pPlayer->GetReputationRank(81) != REP_EXALTED && race != RACE_TAUREN)
- pPlayer->SEND_GOSSIP_MENU(5843, creature->GetGUID());
+ if (player->GetReputationRank(81) != REP_EXALTED && race != RACE_TAUREN)
+ player->SEND_GOSSIP_MENU(5843, creature->GetGUID());
else canBuy = true;
break;
case 4730: //Lelanai
- if (pPlayer->GetReputationRank(69) != REP_EXALTED && race != RACE_NIGHTELF)
- pPlayer->SEND_GOSSIP_MENU(5844, creature->GetGUID());
+ if (player->GetReputationRank(69) != REP_EXALTED && race != RACE_NIGHTELF)
+ player->SEND_GOSSIP_MENU(5844, creature->GetGUID());
else canBuy = true;
break;
case 4731: //Zachariah Post
- if (pPlayer->GetReputationRank(68) != REP_EXALTED && race != RACE_UNDEAD_PLAYER)
- pPlayer->SEND_GOSSIP_MENU(5840, creature->GetGUID());
+ if (player->GetReputationRank(68) != REP_EXALTED && race != RACE_UNDEAD_PLAYER)
+ player->SEND_GOSSIP_MENU(5840, creature->GetGUID());
else canBuy = true;
break;
case 7952: //Zjolnir
- if (pPlayer->GetReputationRank(530) != REP_EXALTED && race != RACE_TROLL)
- pPlayer->SEND_GOSSIP_MENU(5842, creature->GetGUID());
+ if (player->GetReputationRank(530) != REP_EXALTED && race != RACE_TROLL)
+ player->SEND_GOSSIP_MENU(5842, creature->GetGUID());
else canBuy = true;
break;
case 7955: //Milli Featherwhistle
- if (pPlayer->GetReputationRank(54) != REP_EXALTED && race != RACE_GNOME)
- pPlayer->SEND_GOSSIP_MENU(5857, creature->GetGUID());
+ if (player->GetReputationRank(54) != REP_EXALTED && race != RACE_GNOME)
+ player->SEND_GOSSIP_MENU(5857, creature->GetGUID());
else canBuy = true;
break;
case 16264: //Winaestra
- if (pPlayer->GetReputationRank(911) != REP_EXALTED && race != RACE_BLOODELF)
- pPlayer->SEND_GOSSIP_MENU(10305, creature->GetGUID());
+ if (player->GetReputationRank(911) != REP_EXALTED && race != RACE_BLOODELF)
+ player->SEND_GOSSIP_MENU(10305, creature->GetGUID());
else canBuy = true;
break;
case 17584: //Torallius the Pack Handler
- if (pPlayer->GetReputationRank(930) != REP_EXALTED && race != RACE_DRAENEI)
- pPlayer->SEND_GOSSIP_MENU(10239, creature->GetGUID());
+ if (player->GetReputationRank(930) != REP_EXALTED && race != RACE_DRAENEI)
+ player->SEND_GOSSIP_MENU(10239, creature->GetGUID());
else canBuy = true;
break;
}
@@ -1240,17 +1240,17 @@ public:
if (canBuy)
{
if (creature->isVendor())
- pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+ 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;
}
@@ -1269,66 +1269,66 @@ class npc_rogue_trainer : public CreatureScript
public:
npc_rogue_trainer() : CreatureScript("npc_rogue_trainer") { }
- 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->isTrainer())
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
- if (creature->isCanTrainingAndResetTalentsOf(pPlayer))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE1, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS);
+ if (creature->isCanTrainingAndResetTalentsOf(player))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE1, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS);
- if (pPlayer->GetSpecsCount() == 1 && creature->isCanTrainingAndResetTalentsOf(pPlayer) && pPlayer->getLevel() >= sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE3, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_LEARNDUALSPEC);
+ if (player->GetSpecsCount() == 1 && creature->isCanTrainingAndResetTalentsOf(player) && player->getLevel() >= sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE3, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_LEARNDUALSPEC);
- if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126, 1) && !pPlayer->GetQuestRewardStatus(6681))
+ if (player->getClass() == CLASS_ROGUE && player->getLevel() >= 24 && !player->HasItemCount(17126, 1) && !player->GetQuestRewardStatus(6681))
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ROGUE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
- pPlayer->SEND_GOSSIP_MENU(5996, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ROGUE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ player->SEND_GOSSIP_MENU(5996, creature->GetGUID());
} else
- 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();
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF+1:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, 21100, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, 21100, false);
break;
case GOSSIP_ACTION_TRAIN:
- pPlayer->GetSession()->SendTrainerList(creature->GetGUID());
+ player->GetSession()->SendTrainerList(creature->GetGUID());
break;
case GOSSIP_OPTION_UNLEARNTALENTS:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->SendTalentWipeConfirm(creature->GetGUID());
+ player->CLOSE_GOSSIP_MENU();
+ player->SendTalentWipeConfirm(creature->GetGUID());
break;
case GOSSIP_OPTION_LEARNDUALSPEC:
- if (pPlayer->GetSpecsCount() == 1 && !(pPlayer->getLevel() < sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)))
+ if (player->GetSpecsCount() == 1 && !(player->getLevel() < sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)))
{
- if (!pPlayer->HasEnoughMoney(10000000))
+ if (!player->HasEnoughMoney(10000000))
{
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
- pPlayer->PlayerTalkClass->SendCloseGossip();
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
+ player->PlayerTalkClass->SendCloseGossip();
break;
}
else
{
- pPlayer->ModifyMoney(-10000000);
+ player->ModifyMoney(-10000000);
// Cast spells that teach dual spec
// Both are also ImplicitTarget self and must be cast by player
- pPlayer->CastSpell(pPlayer, 63680, true, NULL, NULL, pPlayer->GetGUID());
- pPlayer->CastSpell(pPlayer, 63624, true, NULL, NULL, pPlayer->GetGUID());
+ player->CastSpell(player, 63680, true, NULL, NULL, player->GetGUID());
+ player->CastSpell(player, 63624, true, NULL, NULL, player->GetGUID());
// Should show another Gossip text with "Congratulations..."
- pPlayer->PlayerTalkClass->SendCloseGossip();
+ player->PlayerTalkClass->SendCloseGossip();
}
}
break;
@@ -1375,122 +1375,122 @@ class npc_sayge : public CreatureScript
public:
npc_sayge() : CreatureScript("npc_sayge") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
- pPlayer->PrepareQuestMenu(creature->GetGUID());
-
- if (pPlayer->HasSpellCooldown(SPELL_INT) ||
- pPlayer->HasSpellCooldown(SPELL_ARM) ||
- pPlayer->HasSpellCooldown(SPELL_DMG) ||
- pPlayer->HasSpellCooldown(SPELL_RES) ||
- pPlayer->HasSpellCooldown(SPELL_STR) ||
- pPlayer->HasSpellCooldown(SPELL_AGI) ||
- pPlayer->HasSpellCooldown(SPELL_STM) ||
- pPlayer->HasSpellCooldown(SPELL_SPI))
- pPlayer->SEND_GOSSIP_MENU(7393, creature->GetGUID());
+ player->PrepareQuestMenu(creature->GetGUID());
+
+ if (player->HasSpellCooldown(SPELL_INT) ||
+ player->HasSpellCooldown(SPELL_ARM) ||
+ player->HasSpellCooldown(SPELL_DMG) ||
+ player->HasSpellCooldown(SPELL_RES) ||
+ player->HasSpellCooldown(SPELL_STR) ||
+ player->HasSpellCooldown(SPELL_AGI) ||
+ player->HasSpellCooldown(SPELL_STM) ||
+ player->HasSpellCooldown(SPELL_SPI))
+ player->SEND_GOSSIP_MENU(7393, creature->GetGUID());
else
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_SAYGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
- pPlayer->SEND_GOSSIP_MENU(7339, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_SAYGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ player->SEND_GOSSIP_MENU(7339, creature->GetGUID());
}
return true;
}
- void SendAction(Player* pPlayer, Creature* creature, uint32 uiAction)
+ void SendAction(Player* player, Creature* creature, uint32 uiAction)
{
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF+1:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
- pPlayer->SEND_GOSSIP_MENU(7340, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+ player->SEND_GOSSIP_MENU(7340, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE5, GOSSIP_SENDER_MAIN+1, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE6, GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE7, GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
- pPlayer->SEND_GOSSIP_MENU(7341, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE5, GOSSIP_SENDER_MAIN+1, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE6, GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE7, GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
+ player->SEND_GOSSIP_MENU(7341, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE8, GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE9, GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE10, GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
- pPlayer->SEND_GOSSIP_MENU(7361, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE8, GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE9, GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE10, GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
+ player->SEND_GOSSIP_MENU(7361, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE11, GOSSIP_SENDER_MAIN+6, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE12, GOSSIP_SENDER_MAIN+7, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE13, GOSSIP_SENDER_MAIN+8, GOSSIP_ACTION_INFO_DEF);
- pPlayer->SEND_GOSSIP_MENU(7362, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE11, GOSSIP_SENDER_MAIN+6, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE12, GOSSIP_SENDER_MAIN+7, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE13, GOSSIP_SENDER_MAIN+8, GOSSIP_ACTION_INFO_DEF);
+ player->SEND_GOSSIP_MENU(7362, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE14, GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE15, GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE16, GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
- pPlayer->SEND_GOSSIP_MENU(7363, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE14, GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE15, GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE16, GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
+ player->SEND_GOSSIP_MENU(7363, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF:
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE17, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
- pPlayer->SEND_GOSSIP_MENU(7364, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE17, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+ player->SEND_GOSSIP_MENU(7364, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
- creature->CastSpell(pPlayer, SPELL_FORTUNE, false);
- pPlayer->SEND_GOSSIP_MENU(7365, creature->GetGUID());
+ creature->CastSpell(player, SPELL_FORTUNE, false);
+ player->SEND_GOSSIP_MENU(7365, creature->GetGUID());
break;
}
}
- 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(uiSender)
{
case GOSSIP_SENDER_MAIN:
- SendAction(pPlayer, creature, uiAction);
+ SendAction(player, creature, uiAction);
break;
case GOSSIP_SENDER_MAIN+1:
- creature->CastSpell(pPlayer, SPELL_DMG, false);
- pPlayer->AddSpellCooldown(SPELL_DMG, 0, time(NULL) + 7200);
- SendAction(pPlayer, creature, uiAction);
+ creature->CastSpell(player, SPELL_DMG, false);
+ player->AddSpellCooldown(SPELL_DMG, 0, time(NULL) + 7200);
+ SendAction(player, creature, uiAction);
break;
case GOSSIP_SENDER_MAIN+2:
- creature->CastSpell(pPlayer, SPELL_RES, false);
- pPlayer->AddSpellCooldown(SPELL_RES, 0, time(NULL) + 7200);
- SendAction(pPlayer, creature, uiAction);
+ creature->CastSpell(player, SPELL_RES, false);
+ player->AddSpellCooldown(SPELL_RES, 0, time(NULL) + 7200);
+ SendAction(player, creature, uiAction);
break;
case GOSSIP_SENDER_MAIN+3:
- creature->CastSpell(pPlayer, SPELL_ARM, false);
- pPlayer->AddSpellCooldown(SPELL_ARM, 0, time(NULL) + 7200);
- SendAction(pPlayer, creature, uiAction);
+ creature->CastSpell(player, SPELL_ARM, false);
+ player->AddSpellCooldown(SPELL_ARM, 0, time(NULL) + 7200);
+ SendAction(player, creature, uiAction);
break;
case GOSSIP_SENDER_MAIN+4:
- creature->CastSpell(pPlayer, SPELL_SPI, false);
- pPlayer->AddSpellCooldown(SPELL_SPI, 0, time(NULL) + 7200);
- SendAction(pPlayer, creature, uiAction);
+ creature->CastSpell(player, SPELL_SPI, false);
+ player->AddSpellCooldown(SPELL_SPI, 0, time(NULL) + 7200);
+ SendAction(player, creature, uiAction);
break;
case GOSSIP_SENDER_MAIN+5:
- creature->CastSpell(pPlayer, SPELL_INT, false);
- pPlayer->AddSpellCooldown(SPELL_INT, 0, time(NULL) + 7200);
- SendAction(pPlayer, creature, uiAction);
+ creature->CastSpell(player, SPELL_INT, false);
+ player->AddSpellCooldown(SPELL_INT, 0, time(NULL) + 7200);
+ SendAction(player, creature, uiAction);
break;
case GOSSIP_SENDER_MAIN+6:
- creature->CastSpell(pPlayer, SPELL_STM, false);
- pPlayer->AddSpellCooldown(SPELL_STM, 0, time(NULL) + 7200);
- SendAction(pPlayer, creature, uiAction);
+ creature->CastSpell(player, SPELL_STM, false);
+ player->AddSpellCooldown(SPELL_STM, 0, time(NULL) + 7200);
+ SendAction(player, creature, uiAction);
break;
case GOSSIP_SENDER_MAIN+7:
- creature->CastSpell(pPlayer, SPELL_STR, false);
- pPlayer->AddSpellCooldown(SPELL_STR, 0, time(NULL) + 7200);
- SendAction(pPlayer, creature, uiAction);
+ creature->CastSpell(player, SPELL_STR, false);
+ player->AddSpellCooldown(SPELL_STR, 0, time(NULL) + 7200);
+ SendAction(player, creature, uiAction);
break;
case GOSSIP_SENDER_MAIN+8:
- creature->CastSpell(pPlayer, SPELL_AGI, false);
- pPlayer->AddSpellCooldown(SPELL_AGI, 0, time(NULL) + 7200);
- SendAction(pPlayer, creature, uiAction);
+ creature->CastSpell(player, SPELL_AGI, false);
+ player->AddSpellCooldown(SPELL_AGI, 0, time(NULL) + 7200);
+ SendAction(player, creature, uiAction);
break;
}
return true;
@@ -1585,13 +1585,13 @@ public:
struct npc_brewfest_revelerAI : public ScriptedAI
{
npc_brewfest_revelerAI(Creature* c) : ScriptedAI(c) {}
- void ReceiveEmote(Player* pPlayer, uint32 emote)
+ void ReceiveEmote(Player* player, uint32 emote)
{
if (!IsHolidayActive(HOLIDAY_BREWFEST))
return;
if (emote == TEXT_EMOTE_DANCE)
- me->CastSpell(pPlayer, 41586, false);
+ me->CastSpell(player, 41586, false);
}
};
@@ -1613,23 +1613,23 @@ public:
struct npc_winter_revelerAI : public ScriptedAI
{
npc_winter_revelerAI(Creature* c) : ScriptedAI(c) {}
- void ReceiveEmote(Player* pPlayer, uint32 emote)
+ void ReceiveEmote(Player* player, uint32 emote)
{
if (!IsHolidayActive(HOLIDAY_FEAST_OF_WINTER_VEIL))
return;
//TODO: check auralist.
- if (pPlayer->HasAura(26218))
+ if (player->HasAura(26218))
return;
if (emote == TEXT_EMOTE_KISS)
{
me->CastSpell(me, 26218, false);
- pPlayer->CastSpell(pPlayer, 26218, false);
+ player->CastSpell(player, 26218, false);
switch (urand(0, 2))
{
- case 0: me->CastSpell(pPlayer, 26207, false); break;
- case 1: me->CastSpell(pPlayer, 26206, false); break;
- case 2: me->CastSpell(pPlayer, 45036, false); break;
+ case 0: me->CastSpell(player, 26207, false); break;
+ case 1: me->CastSpell(player, 26206, false); break;
+ case 2: me->CastSpell(player, 45036, false); break;
}
}
}
@@ -1793,11 +1793,11 @@ public:
} hearts -= diff;
}
}
- void ReceiveEmote(Player* pPlayer, uint32 emote)
+ void ReceiveEmote(Player* player, uint32 emote)
{
me->HandleEmoteCommand(emote);
Unit* own = me->GetOwner();
- if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != pPlayer->GetTeam())
+ if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != player->GetTeam())
return;
if (emote == TEXT_EMOTE_KISS)
{
@@ -1812,22 +1812,22 @@ public:
case 5:whisp.append(SAY_RANDOM_MOJO5);break;
case 6:
whisp.append(SAY_RANDOM_MOJO6a);
- whisp.append(pPlayer->GetName());
+ whisp.append(player->GetName());
whisp.append(SAY_RANDOM_MOJO6b);
break;
case 7:whisp.append(SAY_RANDOM_MOJO7);break;
}
- me->MonsterWhisper(whisp.c_str(), pPlayer->GetGUID());
+ me->MonsterWhisper(whisp.c_str(), player->GetGUID());
if (victimGUID)
{
Player* victim = Unit::GetPlayer(*me, victimGUID);
if (victim)
victim->RemoveAura(43906);//remove polymorph frog thing
}
- me->AddAura(43906, pPlayer);//add polymorph frog thing
- victimGUID = pPlayer->GetGUID();
+ me->AddAura(43906, player);//add polymorph frog thing
+ victimGUID = player->GetGUID();
DoCast(me, 20372, true);//tag.hearts
- me->GetMotionMaster()->MoveFollow(pPlayer, 0, 0);
+ me->GetMotionMaster()->MoveFollow(player, 0, 0);
hearts = 15000;
}
}
@@ -2148,53 +2148,53 @@ class npc_wormhole : public CreatureScript
public:
npc_wormhole() : CreatureScript("npc_wormhole") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isSummon())
{
- if (pPlayer == creature->ToTempSummon()->GetSummoner())
+ if (player == creature->ToTempSummon()->GetSummoner())
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
- pPlayer->PlayerTalkClass->SendGossipMenu(TEXT_WORMHOLE, creature->GetGUID());
+ player->PlayerTalkClass->SendGossipMenu(TEXT_WORMHOLE, 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();
bool roll = urand(0, 1);
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF + 1: //Borean Tundra
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->CLOSE_GOSSIP_MENU();
if (roll) //At the moment we don't have chance on spell_target_position table so we hack this
- pPlayer->TeleportTo(571, 4305.505859f, 5450.839844f, 63.005806f, 0.627286f);
+ player->TeleportTo(571, 4305.505859f, 5450.839844f, 63.005806f, 0.627286f);
else
- pPlayer->TeleportTo(571, 3201.936279f, 5630.123535f, 133.658798f, 3.855272f);
+ player->TeleportTo(571, 3201.936279f, 5630.123535f, 133.658798f, 3.855272f);
break;
case GOSSIP_ACTION_INFO_DEF + 2: //Howling Fjord
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_HOWLING_FJORD, true);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_HOWLING_FJORD, true);
break;
case GOSSIP_ACTION_INFO_DEF + 3: //Sholazar Basin
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_SHOLAZAR_BASIN, true);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_SHOLAZAR_BASIN, true);
break;
case GOSSIP_ACTION_INFO_DEF + 4: //Icecrown
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_ICECROWN, true);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_ICECROWN, true);
break;
case GOSSIP_ACTION_INFO_DEF + 5: //Storm peaks
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_STORM_PEAKS, true);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_STORM_PEAKS, true);
break;
}
return true;
@@ -2222,42 +2222,42 @@ class npc_pet_trainer : public CreatureScript
public:
npc_pet_trainer() : CreatureScript("npc_pet_trainer") { }
- 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->getClass() == CLASS_HUNTER)
+ if (player->getClass() == CLASS_HUNTER)
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
- if (pPlayer->GetPet() && pPlayer->GetPet()->getPetType() == HUNTER_PET)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ if (player->GetPet() && player->GetPet()->getPetType() == HUNTER_PET)
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
- pPlayer->PlayerTalkClass->SendGossipMenu(TEXT_ISHUNTER, creature->GetGUID());
+ player->PlayerTalkClass->SendGossipMenu(TEXT_ISHUNTER, creature->GetGUID());
return true;
}
- pPlayer->PlayerTalkClass->SendGossipMenu(TEXT_NOTHUNTER, creature->GetGUID());
+ player->PlayerTalkClass->SendGossipMenu(TEXT_NOTHUNTER, 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->PlayerTalkClass->SendGossipMenu(TEXT_PETINFO, creature->GetGUID());
+ player->PlayerTalkClass->SendGossipMenu(TEXT_PETINFO, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 2:
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET_CONFIRM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
- pPlayer->PlayerTalkClass->SendGossipMenu(TEXT_CONFIRM, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET_CONFIRM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+ player->PlayerTalkClass->SendGossipMenu(TEXT_CONFIRM, creature->GetGUID());
}
break;
case GOSSIP_ACTION_INFO_DEF + 3:
{
- pPlayer->ResetPetTalents();
- pPlayer->CLOSE_GOSSIP_MENU();
+ player->ResetPetTalents();
+ player->CLOSE_GOSSIP_MENU();
}
break;
}
@@ -2307,67 +2307,67 @@ class npc_locksmith : public CreatureScript
public:
npc_locksmith() : CreatureScript("npc_locksmith") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
// Arcatraz Key
- if (pPlayer->GetQuestRewardStatus(QUEST_HOW_TO_BRAKE_IN_TO_THE_ARCATRAZ) && !pPlayer->HasItemCount(ITEM_ARCATRAZ_KEY, 1, true))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_ARCATRAZ_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +1);
+ if (player->GetQuestRewardStatus(QUEST_HOW_TO_BRAKE_IN_TO_THE_ARCATRAZ) && !player->HasItemCount(ITEM_ARCATRAZ_KEY, 1, true))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_ARCATRAZ_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +1);
// Shadowforge Key
- if (pPlayer->GetQuestRewardStatus(QUEST_DARK_IRON_LEGACY) && !pPlayer->HasItemCount(ITEM_SHADOWFORGE_KEY, 1, true))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_SHADOWFORGE_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +2);
+ if (player->GetQuestRewardStatus(QUEST_DARK_IRON_LEGACY) && !player->HasItemCount(ITEM_SHADOWFORGE_KEY, 1, true))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_SHADOWFORGE_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +2);
// Skeleton Key
- if ((pPlayer->GetQuestRewardStatus(QUEST_THE_KEY_TO_SCHOLOMANCE_A) || pPlayer->GetQuestRewardStatus(QUEST_THE_KEY_TO_SCHOLOMANCE_H)) &&
- !pPlayer->HasItemCount(ITEM_SKELETON_KEY, 1, true))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_SKELETON_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +3);
+ if ((player->GetQuestRewardStatus(QUEST_THE_KEY_TO_SCHOLOMANCE_A) || player->GetQuestRewardStatus(QUEST_THE_KEY_TO_SCHOLOMANCE_H)) &&
+ !player->HasItemCount(ITEM_SKELETON_KEY, 1, true))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_SKELETON_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +3);
// Shatered Halls Key
- if ((pPlayer->GetQuestRewardStatus(QUEST_HOTTER_THAN_HELL_A) || pPlayer->GetQuestRewardStatus(QUEST_HOTTER_THAN_HELL_H)) &&
- !pPlayer->HasItemCount(ITEM_SHATTERED_HALLS_KEY, 1, true))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_SHATTERED_HALLS_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +4);
+ if ((player->GetQuestRewardStatus(QUEST_HOTTER_THAN_HELL_A) || player->GetQuestRewardStatus(QUEST_HOTTER_THAN_HELL_H)) &&
+ !player->HasItemCount(ITEM_SHATTERED_HALLS_KEY, 1, true))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_SHATTERED_HALLS_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +4);
// Master's Key
- if (pPlayer->GetQuestRewardStatus(QUEST_RETURN_TO_KHAGDAR) && !pPlayer->HasItemCount(ITEM_THE_MASTERS_KEY, 1, true))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_THE_MASTERS_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +5);
+ if (player->GetQuestRewardStatus(QUEST_RETURN_TO_KHAGDAR) && !player->HasItemCount(ITEM_THE_MASTERS_KEY, 1, true))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_THE_MASTERS_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +5);
// Violet Hold Key
- if (pPlayer->GetQuestRewardStatus(QUEST_CONTAINMENT) && !pPlayer->HasItemCount(ITEM_VIOLET_HOLD_KEY, 1, true))
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_VIOLET_HOLD_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +6);
+ if (player->GetQuestRewardStatus(QUEST_CONTAINMENT) && !player->HasItemCount(ITEM_VIOLET_HOLD_KEY, 1, true))
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_VIOLET_HOLD_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +6);
- 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();
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF+1:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_ARCATRAZ_KEY, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_ARCATRAZ_KEY, false);
break;
case GOSSIP_ACTION_INFO_DEF+2:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_SHADOWFORGE_KEY, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_SHADOWFORGE_KEY, false);
break;
case GOSSIP_ACTION_INFO_DEF+3:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_SKELETON_KEY, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_SKELETON_KEY, false);
break;
case GOSSIP_ACTION_INFO_DEF+4:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_SHATTERED_HALLS_KEY, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_SHATTERED_HALLS_KEY, false);
break;
case GOSSIP_ACTION_INFO_DEF+5:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_THE_MASTERS_KEY, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_THE_MASTERS_KEY, false);
break;
case GOSSIP_ACTION_INFO_DEF+6:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_VIOLET_HOLD_KEY, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_VIOLET_HOLD_KEY, false);
break;
}
return true;
@@ -2431,7 +2431,7 @@ class npc_tabard_vendor : public CreatureScript
public:
npc_tabard_vendor() : CreatureScript("npc_tabard_vendor") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
bool m_bLostBloodKnight = false;
bool m_bLostHand = false;
@@ -2440,100 +2440,100 @@ public:
bool m_bLostSummer = false;
//Tabard of the Blood Knight
- if (pPlayer->GetQuestRewardStatus(QUEST_TRUE_MASTERS_OF_LIGHT) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_BLOOD_KNIGHT, 1, true))
+ if (player->GetQuestRewardStatus(QUEST_TRUE_MASTERS_OF_LIGHT) && !player->HasItemCount(ITEM_TABARD_OF_THE_BLOOD_KNIGHT, 1, true))
m_bLostBloodKnight = true;
//Tabard of the Hand
- if (pPlayer->GetQuestRewardStatus(QUEST_THE_UNWRITTEN_PROPHECY) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_HAND, 1, true))
+ if (player->GetQuestRewardStatus(QUEST_THE_UNWRITTEN_PROPHECY) && !player->HasItemCount(ITEM_TABARD_OF_THE_HAND, 1, true))
m_bLostHand = true;
//Tabard of the Protector
- if (pPlayer->GetQuestRewardStatus(QUEST_INTO_THE_BREACH) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_PROTECTOR, 1, true))
+ if (player->GetQuestRewardStatus(QUEST_INTO_THE_BREACH) && !player->HasItemCount(ITEM_TABARD_OF_THE_PROTECTOR, 1, true))
m_bLostProtector = true;
//Green Trophy Tabard of the Illidari
//Purple Trophy Tabard of the Illidari
- if (pPlayer->GetQuestRewardStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) &&
- (!pPlayer->HasItemCount(ITEM_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) &&
- !pPlayer->HasItemCount(ITEM_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) &&
- !pPlayer->HasItemCount(ITEM_OFFERING_OF_THE_SHATAR, 1, true)))
+ if (player->GetQuestRewardStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) &&
+ (!player->HasItemCount(ITEM_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) &&
+ !player->HasItemCount(ITEM_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) &&
+ !player->HasItemCount(ITEM_OFFERING_OF_THE_SHATAR, 1, true)))
m_bLostIllidari = true;
//Tabard of Summer Skies
//Tabard of Summer Flames
- if (pPlayer->GetQuestRewardStatus(QUEST_SHARDS_OF_AHUNE) &&
- !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_SKIES, 1, true) &&
- !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_FLAMES, 1, true))
+ if (player->GetQuestRewardStatus(QUEST_SHARDS_OF_AHUNE) &&
+ !player->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_SKIES, 1, true) &&
+ !player->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_FLAMES, 1, true))
m_bLostSummer = true;
if (m_bLostBloodKnight || m_bLostHand || m_bLostProtector || m_bLostIllidari || m_bLostSummer)
{
- 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 (m_bLostBloodKnight)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_BLOOD_KNIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +1);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_BLOOD_KNIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +1);
if (m_bLostHand)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_HAND, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +2);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_HAND, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +2);
if (m_bLostProtector)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_PROTECTOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_PROTECTOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
if (m_bLostIllidari)
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
}
if (m_bLostSummer)
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_SKIES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_FLAMES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_SKIES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_FLAMES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
}
- pPlayer->SEND_GOSSIP_MENU(13583, creature->GetGUID());
+ player->SEND_GOSSIP_MENU(13583, creature->GetGUID());
}
else
- pPlayer->GetSession()->SendListInventory(creature->GetGUID());
+ player->GetSession()->SendListInventory(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_TRADE:
- pPlayer->GetSession()->SendListInventory(creature->GetGUID());
+ player->GetSession()->SendListInventory(creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+1:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_BLOOD_KNIGHT, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_TABARD_OF_THE_BLOOD_KNIGHT, false);
break;
case GOSSIP_ACTION_INFO_DEF+2:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_HAND, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_TABARD_OF_THE_HAND, false);
break;
case GOSSIP_ACTION_INFO_DEF+3:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_PROTECTOR, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_TABARD_OF_THE_PROTECTOR, false);
break;
case GOSSIP_ACTION_INFO_DEF+4:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, false);
break;
case GOSSIP_ACTION_INFO_DEF+5:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, false);
break;
case GOSSIP_ACTION_INFO_DEF+6:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_SUMMER_SKIES, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_TABARD_OF_SUMMER_SKIES, false);
break;
case GOSSIP_ACTION_INFO_DEF+7:
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_SUMMER_FLAMES, false);
+ player->CLOSE_GOSSIP_MENU();
+ player->CastSpell(player, SPELL_TABARD_OF_SUMMER_FLAMES, false);
break;
}
return true;
@@ -2554,18 +2554,18 @@ class npc_experience : public CreatureScript
public:
npc_experience() : CreatureScript("npc_experience") { }
- bool OnGossipHello(Player* pPlayer, Creature* creature)
+ bool OnGossipHello(Player* player, Creature* creature)
{
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_XP_OFF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_XP_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
- pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXT_EXP, creature->GetGUID());
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_XP_OFF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_XP_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+ player->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXT_EXP, 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();
- bool noXPGain = pPlayer->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
+ player->PlayerTalkClass->ClearMenus();
+ bool noXPGain = player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
bool doSwitch = false;
switch(uiAction)
@@ -2585,20 +2585,20 @@ public:
}
if (doSwitch)
{
- if (!pPlayer->HasEnoughMoney(EXP_COST))
- pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
+ if (!player->HasEnoughMoney(EXP_COST))
+ player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
else if (noXPGain)
{
- pPlayer->ModifyMoney(-EXP_COST);
- pPlayer->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
+ player->ModifyMoney(-EXP_COST);
+ player->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
}
else if (!noXPGain)
{
- pPlayer->ModifyMoney(-EXP_COST);
- pPlayer->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
+ player->ModifyMoney(-EXP_COST);
+ player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
}
}
- pPlayer->PlayerTalkClass->SendCloseGossip();
+ player->PlayerTalkClass->SendCloseGossip();
return true;
}
};