josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Cleaning up hungarian notation - Phase2: pPlayer -> player

Browse Source
This commit is contained in:
click
2011-07-02 22:52:42 +02:00
parent f91ee24184
commit 169f5da8c3
134 changed files with 4039 additions and 4039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+70 -70
View File
@@ -49,7 +49,7 @@ class go_shadowforge_brazier : public GameObjectScript
public: public:
go_shadowforge_brazier() : GameObjectScript("go_shadowforge_brazier") { } go_shadowforge_brazier() : GameObjectScript("go_shadowforge_brazier") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{ {
if (InstanceScript* pInstance = pGo->GetInstanceScript()) if (InstanceScript* pInstance = pGo->GetInstanceScript())
{ {
@@ -106,15 +106,15 @@ class at_ring_of_law : public AreaTriggerScript
public: public:
at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { } at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { }
bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) bool OnTrigger(Player* player, const AreaTriggerEntry * /*at*/)
{ {
if (InstanceScript* pInstance = pPlayer->GetInstanceScript()) if (InstanceScript* pInstance = player->GetInstanceScript())
{ {
if (pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || pInstance->GetData(TYPE_RING_OF_LAW) == DONE) if (pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || pInstance->GetData(TYPE_RING_OF_LAW) == DONE)
return false; return false;
pInstance->SetData(TYPE_RING_OF_LAW, IN_PROGRESS); pInstance->SetData(TYPE_RING_OF_LAW, IN_PROGRESS);
pPlayer->SummonCreature(NPC_GRIMSTONE, 625.559f, -205.618f, -52.735f, 2.609f, TEMPSUMMON_DEAD_DESPAWN, 0); player->SummonCreature(NPC_GRIMSTONE, 625.559f, -205.618f, -52.735f, 2.609f, TEMPSUMMON_DEAD_DESPAWN, 0);
return false; return false;
} }
@@ -467,70 +467,70 @@ class npc_kharan_mighthammer : public CreatureScript
public: public:
npc_kharan_mighthammer() : CreatureScript("npc_kharan_mighthammer") { } npc_kharan_mighthammer() : CreatureScript("npc_kharan_mighthammer") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(2475, creature->GetGUID()); player->SEND_GOSSIP_MENU(2475, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(2476, creature->GetGUID()); player->SEND_GOSSIP_MENU(2476, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(2477, creature->GetGUID()); player->SEND_GOSSIP_MENU(2477, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(2478, creature->GetGUID()); player->SEND_GOSSIP_MENU(2478, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(2479, creature->GetGUID()); player->SEND_GOSSIP_MENU(2479, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
pPlayer->SEND_GOSSIP_MENU(2480, creature->GetGUID()); player->SEND_GOSSIP_MENU(2480, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
pPlayer->SEND_GOSSIP_MENU(2481, creature->GetGUID()); player->SEND_GOSSIP_MENU(2481, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+8: case GOSSIP_ACTION_INFO_DEF+8:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
pPlayer->SEND_GOSSIP_MENU(2482, creature->GetGUID()); player->SEND_GOSSIP_MENU(2482, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+9: case GOSSIP_ACTION_INFO_DEF+9:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pPlayer->GetTeam() == HORDE) if (player->GetTeam() == HORDE)
pPlayer->AreaExploredOrEventHappens(QUEST_4001); player->AreaExploredOrEventHappens(QUEST_4001);
else else
pPlayer->AreaExploredOrEventHappens(QUEST_4342); player->AreaExploredOrEventHappens(QUEST_4342);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (pPlayer->GetQuestStatus(4342) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(4342) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
if (pPlayer->GetTeam() == HORDE) if (player->GetTeam() == HORDE)
pPlayer->SEND_GOSSIP_MENU(2473, creature->GetGUID()); player->SEND_GOSSIP_MENU(2473, creature->GetGUID());
else else
pPlayer->SEND_GOSSIP_MENU(2474, creature->GetGUID()); player->SEND_GOSSIP_MENU(2474, creature->GetGUID());
return true; return true;
} }
@@ -565,39 +565,39 @@ class npc_lokhtos_darkbargainer : public CreatureScript
public: public:
npc_lokhtos_darkbargainer() : CreatureScript("npc_lokhtos_darkbargainer") { } npc_lokhtos_darkbargainer() : CreatureScript("npc_lokhtos_darkbargainer") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false); player->CastSpell(player, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false);
} }
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->GetSession()->SendListInventory(creature->GetGUID()); player->GetSession()->SendListInventory(creature->GetGUID());
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY) if (creature->isVendor() && player->GetReputationRank(59) >= REP_FRIENDLY)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (pPlayer->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 && if (player->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 &&
!pPlayer->HasItemCount(ITEM_THRORIUM_BROTHERHOOD_CONTRACT, 1, true) && !player->HasItemCount(ITEM_THRORIUM_BROTHERHOOD_CONTRACT, 1, true) &&
pPlayer->HasItemCount(ITEM_SULFURON_INGOT, 1)) player->HasItemCount(ITEM_SULFURON_INGOT, 1))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GET_CONTRACT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GET_CONTRACT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
} }
if (pPlayer->GetReputationRank(59) < REP_FRIENDLY) if (player->GetReputationRank(59) < REP_FRIENDLY)
pPlayer->SEND_GOSSIP_MENU(3673, creature->GetGUID()); player->SEND_GOSSIP_MENU(3673, creature->GetGUID());
else else
pPlayer->SEND_GOSSIP_MENU(3677, creature->GetGUID()); player->SEND_GOSSIP_MENU(3677, creature->GetGUID());
return true; return true;
} }
@@ -633,25 +633,25 @@ public:
return dughal_stormwingAI; return dughal_stormwingAI;
} }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, pPlayer->GetGUID()); CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, player->GetGUID());
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2846, creature->GetGUID()); player->SEND_GOSSIP_MENU(2846, creature->GetGUID());
} }
return true; return true;
} }
@@ -727,7 +727,7 @@ public:
#define MOB_ENTRY_REGINALD_WINDSOR 9682 #define MOB_ENTRY_REGINALD_WINDSOR 9682
/* /*
Player* pPlayerStart; Player* playerStart;
class npc_marshal_windsor : public CreatureScript class npc_marshal_windsor : public CreatureScript
{ {
public: public:
@@ -761,13 +761,13 @@ public:
return marshal_windsorAI; return marshal_windsorAI;
} }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const *quest)
{ {
if (quest->GetQuestId() == 4322) if (quest->GetQuestId() == 4322)
{PlayerStart = player; {PlayerStart = player;
if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED)
{ {
CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS);
creature->setFaction(11); creature->setFaction(11);
} }
@@ -1123,25 +1123,25 @@ public:
return tobias_seecherAI; return tobias_seecherAI;
} }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, pPlayer->GetGUID()); CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, player->GetGUID());
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS); pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2847, creature->GetGUID()); player->SEND_GOSSIP_MENU(2847, creature->GetGUID());
} }
return true; return true;
} }
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+25 -25
View File
@@ -52,25 +52,25 @@ class boss_gloomrel : public CreatureScript
public: public:
boss_gloomrel() : CreatureScript("boss_gloomrel") { } boss_gloomrel() : CreatureScript("boss_gloomrel") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(2606, creature->GetGUID()); player->SEND_GOSSIP_MENU(2606, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+11: case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, SPELL_LEARN_SMELT, false); creature->CastSpell(player, SPELL_LEARN_SMELT, false);
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
pPlayer->SEND_GOSSIP_MENU(2604, creature->GetGUID()); player->SEND_GOSSIP_MENU(2604, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+22: case GOSSIP_ACTION_INFO_DEF+22:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (InstanceScript* pInstance = creature->GetInstanceScript()) if (InstanceScript* pInstance = creature->GetInstanceScript())
{ {
//are 5 minutes expected? go template may have data to despawn when used at quest //are 5 minutes expected? go template may have data to despawn when used at quest
@@ -81,15 +81,15 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 1 && pPlayer->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN && !pPlayer->HasSpell(SPELL_SMELT_DARK_IRON)) if (player->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 1 && player->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN && !player->HasSpell(SPELL_SMELT_DARK_IRON))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if (pPlayer->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 0 && pPlayer->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN) if (player->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 0 && player->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -112,33 +112,33 @@ class boss_doomrel : public CreatureScript
public: public:
boss_doomrel() : CreatureScript("boss_doomrel") { } boss_doomrel() : CreatureScript("boss_doomrel") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_DOOMREL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_DOOMREL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(2605, creature->GetGUID()); player->SEND_GOSSIP_MENU(2605, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
//start event here //start event here
creature->setFaction(FACTION_HOSTILE); creature->setFaction(FACTION_HOSTILE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
creature->AI()->AttackStart(pPlayer); creature->AI()->AttackStart(player);
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance) if (pInstance)
pInstance->SetData64(DATA_EVENSTARTER, pPlayer->GetGUID()); pInstance->SetData64(DATA_EVENSTARTER, player->GetGUID());
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2601, creature->GetGUID()); player->SEND_GOSSIP_MENU(2601, creature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+10 -10
View File
@@ -45,31 +45,31 @@ class boss_vaelastrasz : public CreatureScript
public: public:
boss_vaelastrasz() : CreatureScript("boss_vaelastrasz") { } boss_vaelastrasz() : CreatureScript("boss_vaelastrasz") { }
void SendDefaultMenu(Player* pPlayer, Creature* creature, uint32 uiAction) void SendDefaultMenu(Player* player, Creature* creature, uint32 uiAction)
{ {
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
CAST_AI(boss_vaelastrasz::boss_vaelAI, creature->AI())->BeginSpeech(pPlayer); CAST_AI(boss_vaelastrasz::boss_vaelAI, creature->AI())->BeginSpeech(player);
} }
} }
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 (uiSender == GOSSIP_SENDER_MAIN) if (uiSender == GOSSIP_SENDER_MAIN)
SendDefaultMenu(pPlayer, creature, uiAction); SendDefaultMenu(player, creature, uiAction);
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID()); player->SEND_GOSSIP_MENU(907, creature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+11 -11
View File
@@ -74,32 +74,32 @@ class boss_victor_nefarius : public CreatureScript
public: public:
boss_victor_nefarius() : CreatureScript("boss_victor_nefarius") { } boss_victor_nefarius() : CreatureScript("boss_victor_nefarius") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(7198, creature->GetGUID()); player->SEND_GOSSIP_MENU(7198, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(7199, creature->GetGUID()); player->SEND_GOSSIP_MENU(7199, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
DoScriptText(SAY_GAMESBEGIN_1, creature); DoScriptText(SAY_GAMESBEGIN_1, creature);
CAST_AI(boss_victor_nefarius::boss_victor_nefariusAI, creature->AI())->BeginEvent(pPlayer); CAST_AI(boss_victor_nefarius::boss_victor_nefariusAI, creature->AI())->BeginEvent(player);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(7134, creature->GetGUID()); player->SEND_GOSSIP_MENU(7134, creature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+14 -14
View File
@@ -95,30 +95,30 @@ public:
return new npc_blastmaster_emi_shortfuseAI(creature); return new npc_blastmaster_emi_shortfuseAI(creature);
} }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
if (npc_escortAI* pEscortAI = CAST_AI(npc_blastmaster_emi_shortfuse::npc_blastmaster_emi_shortfuseAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_blastmaster_emi_shortfuse::npc_blastmaster_emi_shortfuseAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
creature->setFaction(pPlayer->getFaction()); creature->setFaction(player->getFaction());
creature->AI()->SetData(1, 0); creature->AI()->SetData(1, 0);
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance && pInstance->GetData(TYPE_EVENT) == NOT_STARTED) if (pInstance && pInstance->GetData(TYPE_EVENT) == NOT_STARTED)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_EMI, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXT_EMI, creature->GetGUID());
return true; return true;
} }
@@ -251,16 +251,16 @@ public:
for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
{ {
if (Player* pPlayer = i->getSource()) if (Player* player = i->getSource())
{ {
if (pPlayer->isGameMaster()) if (player->isGameMaster())
continue; continue;
if (pPlayer->isAlive()) if (player->isAlive())
{ {
pTemp->SetInCombatWith(pPlayer); pTemp->SetInCombatWith(player);
pPlayer->SetInCombatWith(pTemp); player->SetInCombatWith(pTemp);
pTemp->AddThreat(pPlayer, 0.0f); pTemp->AddThreat(player, 0.0f);
} }
} }
} }
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+6 -6
View File
@@ -769,13 +769,13 @@ class npc_grandmother : public CreatureScript
public: public:
npc_grandmother() : CreatureScript("npc_grandmother") { } npc_grandmother() : CreatureScript("npc_grandmother") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
{ {
if (Creature* pBigBadWolf = creature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) if (Creature* pBigBadWolf = creature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
pBigBadWolf->AI()->AttackStart(pPlayer); pBigBadWolf->AI()->AttackStart(player);
creature->DespawnOrUnsummon(); creature->DespawnOrUnsummon();
} }
@@ -783,10 +783,10 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(8990, creature->GetGUID()); player->SEND_GOSSIP_MENU(8990, creature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+27 -27
View File
@@ -324,70 +324,70 @@ public:
} }
}; };
bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
{ {
pPlayer->PlayerTalkClass->ClearMenus(); player->PlayerTalkClass->ClearMenus();
npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()); npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI());
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(8971, creature->GetGUID()); player->SEND_GOSSIP_MENU(8971, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pBarnesAI->StartEvent(); pBarnesAI->StartEvent();
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_OZ; pBarnesAI->m_uiEventId = EVENT_OZ;
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ", pPlayer->GetGUID()); sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ", player->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_HOOD; pBarnesAI->m_uiEventId = EVENT_HOOD;
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD", pPlayer->GetGUID()); sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD", player->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_RAJ; pBarnesAI->m_uiEventId = EVENT_RAJ;
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ", pPlayer->GetGUID()); sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ", player->GetGUID());
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (InstanceScript* pInstance = creature->GetInstanceScript()) if (InstanceScript* pInstance = creature->GetInstanceScript())
{ {
// Check for death of Moroes and if opera event is not done already // Check for death of Moroes and if opera event is not done already
if (pInstance->GetData(TYPE_MOROES) == DONE && pInstance->GetData(TYPE_OPERA) != DONE) if (pInstance->GetData(TYPE_MOROES) == DONE && pInstance->GetData(TYPE_OPERA) != DONE)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if (pPlayer->isGameMaster()) if (player->isGameMaster())
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
} }
if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI())) if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()))
{ {
if (!pBarnesAI->RaidWiped) if (!pBarnesAI->RaidWiped)
pPlayer->SEND_GOSSIP_MENU(8970, creature->GetGUID()); player->SEND_GOSSIP_MENU(8970, creature->GetGUID());
else else
pPlayer->SEND_GOSSIP_MENU(8975, creature->GetGUID()); player->SEND_GOSSIP_MENU(8975, creature->GetGUID());
return true; return true;
} }
} }
} }
pPlayer->SEND_GOSSIP_MENU(8978, creature->GetGUID()); player->SEND_GOSSIP_MENU(8978, creature->GetGUID());
return true; return true;
} }
@@ -414,26 +414,26 @@ class npc_berthold : public CreatureScript
public: public:
npc_berthold() : CreatureScript("npc_berthold") { } npc_berthold() : CreatureScript("npc_berthold") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, true); player->CastSpell(player, SPELL_TELEPORT, true);
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (InstanceScript* pInstance = creature->GetInstanceScript()) if (InstanceScript* pInstance = creature->GetInstanceScript())
{ {
// Check if Shade of Aran event is done // Check if Shade of Aran event is done
if (pInstance->GetData(TYPE_ARAN) == DONE) if (pInstance->GetData(TYPE_ARAN) == DONE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, 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; return true;
} }
src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+17 -17
View File
@@ -56,42 +56,42 @@ class npc_kalecgos : public CreatureScript
public: public:
npc_kalecgos() : CreatureScript("npc_kalecgos") { } npc_kalecgos() : CreatureScript("npc_kalecgos") { }
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) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(12500, creature->GetGUID()); player->SEND_GOSSIP_MENU(12500, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(12502, creature->GetGUID()); player->SEND_GOSSIP_MENU(12502, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(12606, creature->GetGUID()); player->SEND_GOSSIP_MENU(12606, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(12607, creature->GetGUID()); player->SEND_GOSSIP_MENU(12607, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->SEND_GOSSIP_MENU(12608, creature->GetGUID()); player->SEND_GOSSIP_MENU(12608, creature->GetGUID());
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(12498, creature->GetGUID()); player->SEND_GOSSIP_MENU(12498, creature->GetGUID());
return true; return true;
} }
@@ -142,10 +142,10 @@ public:
for (Map::PlayerList::const_iterator i = lList.begin(); i != lList.end(); ++i) for (Map::PlayerList::const_iterator i = lList.begin(); i != lList.end(); ++i)
{ {
if (Player* pPlayer = i->getSource()) if (Player* player = i->getSource())
{ {
if (pSpell && pSpell->EffectMiscValue[0]) if (pSpell && pSpell->EffectMiscValue[0])
pPlayer->KilledMonsterCredit(pSpell->EffectMiscValue[0], 0); player->KilledMonsterCredit(pSpell->EffectMiscValue[0], 0);
} }
} }
} }
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+22 -22
View File
@@ -313,12 +313,12 @@ class go_acherus_soul_prison : public GameObjectScript
public: public:
go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { } go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo) bool OnGossipHello(Player* player, GameObject* pGo)
{ {
if (Creature* anchor = pGo->FindNearestCreature(29521, 15)) if (Creature* anchor = pGo->FindNearestCreature(29521, 15))
if (uint64 prisonerGUID = anchor->AI()->GetGUID()) if (uint64 prisonerGUID = anchor->AI()->GetGUID())
if (Creature* prisoner = Creature::GetCreature(*pPlayer, prisonerGUID)) if (Creature* prisoner = Creature::GetCreature(*player, prisonerGUID))
CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, pPlayer); CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, player);
return false; return false;
} }
@@ -362,14 +362,14 @@ class npc_death_knight_initiate : public CreatureScript
public: public:
npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { } npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pPlayer->isInCombat() || creature->isInCombat()) if (player->isInCombat() || creature->isInCombat())
return true; return true;
if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiate::npc_death_knight_initiateAI, creature->AI())) if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiate::npc_death_knight_initiateAI, creature->AI()))
@@ -382,26 +382,26 @@ public:
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15);
int32 uiSayId = rand()% (sizeof(m_auiRandomSay)/sizeof(int32)); int32 uiSayId = rand()% (sizeof(m_auiRandomSay)/sizeof(int32));
DoScriptText(m_auiRandomSay[uiSayId], creature, pPlayer); DoScriptText(m_auiRandomSay[uiSayId], creature, player);
pPlayer->CastSpell(creature, SPELL_DUEL, false); player->CastSpell(creature, SPELL_DUEL, false);
pPlayer->CastSpell(pPlayer, SPELL_DUEL_FLAG, true); player->CastSpell(player, SPELL_DUEL_FLAG, true);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth()) if (player->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth())
{ {
if (pPlayer->HealthBelowPct(10)) if (player->HealthBelowPct(10))
return true; return true;
if (pPlayer->isInCombat() || creature->isInCombat()) if (player->isInCombat() || creature->isInCombat())
return true; return true;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
} }
return true; return true;
} }
@@ -1057,20 +1057,20 @@ class go_inconspicuous_mine_car : public GameObjectScript
public: public:
go_inconspicuous_mine_car() : GameObjectScript("go_inconspicuous_mine_car") { } go_inconspicuous_mine_car() : GameObjectScript("go_inconspicuous_mine_car") { }
bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{ {
if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE)
{ {
// Hack Why Trinity Dont Support Custom Summon Location // Hack Why Trinity Dont Support Custom Summon Location
if (Creature* miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1)) if (Creature* miner = player->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, player->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1))
{ {
pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true); player->CastSpell(player, SPELL_CART_SUMM, true);
if (Creature* car = pPlayer->GetVehicleCreatureBase()) if (Creature* car = player->GetVehicleCreatureBase())
{ {
if (car->GetEntry() == 28817) if (car->GetEntry() == 28817)
{ {
car->AI()->SetGUID(miner->GetGUID()); car->AI()->SetGUID(miner->GetGUID());
CAST_AI(npc_scarlet_miner::npc_scarlet_minerAI, miner->AI())->InitCartQuest(pPlayer); CAST_AI(npc_scarlet_miner::npc_scarlet_minerAI, miner->AI())->InitCartQuest(player);
} else sLog->outError("TSCR: OnGossipHello vehicle entry is not correct."); } else sLog->outError("TSCR: OnGossipHello vehicle entry is not correct.");
} else sLog->outError("TSCR: OnGossipHello player is not on the vehicle."); } else sLog->outError("TSCR: OnGossipHello player is not on the vehicle.");
} else sLog->outError("TSCR: OnGossipHello Scarlet Miner cant be found by script."); } else sLog->outError("TSCR: OnGossipHello Scarlet Miner cant be found by script.");
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+122 -122
View File
@@ -102,8 +102,8 @@ public:
{ {
if (uiSpeech_timer <= diff) if (uiSpeech_timer <= diff)
{ {
Player* pPlayer = Unit::GetPlayer(*me, uiPlayerGUID); Player* player = Unit::GetPlayer(*me, uiPlayerGUID);
if (!pPlayer) if (!player)
{ {
EnterEvadeMode(); EnterEvadeMode();
return; return;
@@ -115,13 +115,13 @@ public:
case 2: DoScriptText(SAY_PERSUADED2, me); uiSpeech_timer = 8000; break; case 2: DoScriptText(SAY_PERSUADED2, me); uiSpeech_timer = 8000; break;
case 3: DoScriptText(SAY_PERSUADED3, me); uiSpeech_timer = 8000; break; case 3: DoScriptText(SAY_PERSUADED3, me); uiSpeech_timer = 8000; break;
case 4: DoScriptText(SAY_PERSUADED4, me); uiSpeech_timer = 8000; break; case 4: DoScriptText(SAY_PERSUADED4, me); uiSpeech_timer = 8000; break;
case 5: DoScriptText(SAY_PERSUADED5, pPlayer); uiSpeech_timer = 8000; break; case 5: DoScriptText(SAY_PERSUADED5, player); uiSpeech_timer = 8000; break;
case 6: DoScriptText(SAY_PERSUADED6, me); case 6: DoScriptText(SAY_PERSUADED6, me);
pPlayer->Kill(me); player->Kill(me);
//me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
//me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); //me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
uiSpeech_counter = 0; uiSpeech_counter = 0;
pPlayer->GroupEventHappens(12720, me); player->GroupEventHappens(12720, me);
return; return;
} }
@@ -177,14 +177,14 @@ class npc_koltira_deathweaver : public CreatureScript
public: public:
npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { } npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_BREAKOUT) if (pQuest->GetQuestId() == QUEST_BREAKOUT)
{ {
creature->SetStandState(UNIT_STAND_STATE_STAND); creature->SetStandState(UNIT_STAND_STATE_STAND);
if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID()); pEscortAI->Start(false, false, player->GetGUID());
} }
return true; return true;
} }
@@ -255,9 +255,9 @@ public:
void JustSummoned(Creature* pSummoned) void JustSummoned(Creature* pSummoned)
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
{ {
pSummoned->AI()->AttackStart(pPlayer); pSummoned->AI()->AttackStart(player);
} }
if (pSummoned->GetEntry() == NPC_HIGH_INQUISITOR_VALROTH) if (pSummoned->GetEntry() == NPC_HIGH_INQUISITOR_VALROTH)
@@ -608,48 +608,48 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
} }
bool MeetQuestCondition(Unit* pPlayer) bool MeetQuestCondition(Unit* player)
{ {
switch(me->GetEntry()) switch(me->GetEntry())
{ {
case 29061: // Ellen Stanbridge case 29061: // Ellen Stanbridge
if (CAST_PLR(pPlayer)->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29072: // Kug Ironjaw case 29072: // Kug Ironjaw
if (CAST_PLR(pPlayer)->GetQuestStatus(12748) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12748) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29067: // Donovan Pulfrost case 29067: // Donovan Pulfrost
if (CAST_PLR(pPlayer)->GetQuestStatus(12744) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12744) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29065: // Yazmina Oakenthorn case 29065: // Yazmina Oakenthorn
if (CAST_PLR(pPlayer)->GetQuestStatus(12743) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12743) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29071: // Antoine Brack case 29071: // Antoine Brack
if (CAST_PLR(pPlayer)->GetQuestStatus(12750) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12750) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29032: // Malar Bravehorn case 29032: // Malar Bravehorn
if (CAST_PLR(pPlayer)->GetQuestStatus(12739) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12739) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29068: // Goby Blastenheimer case 29068: // Goby Blastenheimer
if (CAST_PLR(pPlayer)->GetQuestStatus(12745) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12745) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29073: // Iggy Darktusk case 29073: // Iggy Darktusk
if (CAST_PLR(pPlayer)->GetQuestStatus(12749) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12749) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29074: // Lady Eonys case 29074: // Lady Eonys
if (CAST_PLR(pPlayer)->GetQuestStatus(12747) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12747) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
case 29070: // Valok the Righteous case 29070: // Valok the Righteous
if (CAST_PLR(pPlayer)->GetQuestStatus(12746) == QUEST_STATUS_INCOMPLETE) if (CAST_PLR(player)->GetQuestStatus(12746) == QUEST_STATUS_INCOMPLETE)
return true; return true;
break; break;
} }
@@ -672,9 +672,9 @@ public:
{ {
if (ExecuteSpeech_Timer <= diff) if (ExecuteSpeech_Timer <= diff)
{ {
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer) if (!player)
{ {
Reset(); Reset();
return; return;
@@ -682,29 +682,29 @@ public:
//TODO: simplify text's selection //TODO: simplify text's selection
switch(pPlayer->getRace()) switch(player->getRace())
{ {
case RACE_HUMAN: case RACE_HUMAN:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_5, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_5, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_5, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_5, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_7, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_7, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_6, me, pPlayer); DoScriptText(SAY_EXEC_TIME_6, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -715,24 +715,24 @@ public:
case RACE_ORC: case RACE_ORC:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_6, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_6, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_7, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_7, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_8, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_8, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_8, me, pPlayer); DoScriptText(SAY_EXEC_TIME_8, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -743,24 +743,24 @@ public:
case RACE_DWARF: case RACE_DWARF:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_2, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_2, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_2, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_2, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_3, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_3, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_2, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_2, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_5, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_5, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_2, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_2, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_3, me, pPlayer); DoScriptText(SAY_EXEC_TIME_3, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -771,24 +771,24 @@ public:
case RACE_NIGHTELF: case RACE_NIGHTELF:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_5, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_5, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_6, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_6, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_2, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_2, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_7, me, pPlayer); DoScriptText(SAY_EXEC_TIME_7, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -799,24 +799,24 @@ public:
case RACE_UNDEAD_PLAYER: case RACE_UNDEAD_PLAYER:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_3, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_3, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_4, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_4, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_3, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_3, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_1, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_1, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_3, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_3, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_4, me, pPlayer); DoScriptText(SAY_EXEC_TIME_4, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -827,24 +827,24 @@ public:
case RACE_TAUREN: case RACE_TAUREN:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_1, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_5, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_5, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_8, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_8, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_9, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_9, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_9, me, pPlayer); DoScriptText(SAY_EXEC_TIME_9, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -855,24 +855,24 @@ public:
case RACE_GNOME: case RACE_GNOME:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_4, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_4, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_4, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_4, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_6, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_6, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_5, me, pPlayer); DoScriptText(SAY_EXEC_TIME_5, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -883,24 +883,24 @@ public:
case RACE_TROLL: case RACE_TROLL:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_3, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_3, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_7, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_7, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_2, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_2, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_6, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_6, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_9, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_9, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_10, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_10, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_4, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_4, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_10, me, pPlayer); DoScriptText(SAY_EXEC_TIME_10, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -911,24 +911,24 @@ public:
case RACE_BLOODELF: case RACE_BLOODELF:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_1, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
//case 5: //unknown //case 5: //unknown
case 6: DoScriptText(SAY_EXEC_THINK_3, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_3, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_1, me, pPlayer); DoScriptText(SAY_EXEC_TIME_1, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -939,24 +939,24 @@ public:
case RACE_DRAENEI: case RACE_DRAENEI:
switch(ExecuteSpeech_Counter) switch(ExecuteSpeech_Counter)
{ {
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break; case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, pPlayer); break; case 2: DoScriptText(SAY_EXEC_PROG_1, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break; case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_2, me, pPlayer); break; case 4: DoScriptText(SAY_EXEC_RECOG_2, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_1, me, pPlayer); break; case 5: DoScriptText(SAY_EXEC_NOREM_1, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_4, me, pPlayer); break; case 6: DoScriptText(SAY_EXEC_THINK_4, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break; case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8: case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f)) if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer); DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break; break;
case 9: case 9:
DoScriptText(SAY_EXEC_TIME_2, me, pPlayer); DoScriptText(SAY_EXEC_TIME_2, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break; break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break; case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11: case 11:
DoScriptText(EMOTE_DIES, me); DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+11 -11
View File
@@ -242,8 +242,8 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state)
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
if (Player* pPlayer = itr->getSource()) if (Player* player = itr->getSource())
pPlayer->SendUpdateWorldState(id, state); player->SendUpdateWorldState(id, state);
} }
} }
} }
@@ -287,29 +287,29 @@ class npc_highlord_darion_mograine : public CreatureScript
public: public:
npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { } npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->uiStep = 1; CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->uiStep = 1;
CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->Start(true, false, pPlayer->GetGUID()); CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->Start(true, false, player->GetGUID());
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(0, "I am ready.", 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; return true;
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+4 -4
View File
@@ -830,9 +830,9 @@ class go_loosely_turned_soil : public GameObjectScript
public: public:
go_loosely_turned_soil() : GameObjectScript("go_loosely_turned_soil") { } go_loosely_turned_soil() : GameObjectScript("go_loosely_turned_soil") { }
bool OnGossipHello(Player* pPlayer, GameObject* soil) bool OnGossipHello(Player* player, GameObject* soil)
{ {
InstanceScript* pInstance = pPlayer->GetInstanceScript(); InstanceScript* pInstance = player->GetInstanceScript();
if (pInstance) if (pInstance)
{ {
if (pInstance->GetData(DATA_HORSEMAN_EVENT) != NOT_STARTED) if (pInstance->GetData(DATA_HORSEMAN_EVENT) != NOT_STARTED)
@@ -846,10 +846,10 @@ public:
} }
if (player->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && player->getLevel() > 64) if (player->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && player->getLevel() > 64)
{ */ { */
pPlayer->AreaExploredOrEventHappens(11405); player->AreaExploredOrEventHappens(11405);
if (Creature* horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) if (Creature* horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0))
{ {
CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = player->GetGUID();
CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode(); CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode();
} }
//} //}
src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+6 -6
View File
@@ -63,12 +63,12 @@ public:
return new npc_shadowfang_prisonerAI(creature); return new npc_shadowfang_prisonerAI(creature);
} }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (npc_escortAI* pEscortAI = CAST_AI(npc_shadowfang_prisoner::npc_shadowfang_prisonerAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_shadowfang_prisoner::npc_shadowfang_prisonerAI, creature->AI()))
pEscortAI->Start(false, false); pEscortAI->Start(false, false);
@@ -76,14 +76,14 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance && pInstance->GetData(TYPE_FREE_NPC) != DONE && pInstance->GetData(TYPE_RETHILGORE) == DONE) if (pInstance && pInstance->GetData(TYPE_FREE_NPC) != DONE && pInstance->GetData(TYPE_RETHILGORE) == DONE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DOOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DOOR, 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; return true;
} }
src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+9 -9
View File
@@ -43,7 +43,7 @@ class go_gauntlet_gate : public GameObjectScript
public: public:
go_gauntlet_gate() : GameObjectScript("go_gauntlet_gate") { } go_gauntlet_gate() : GameObjectScript("go_gauntlet_gate") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo) bool OnGossipHello(Player* player, GameObject* pGo)
{ {
InstanceScript* pInstance = pGo->GetInstanceScript(); InstanceScript* pInstance = pGo->GetInstanceScript();
@@ -53,7 +53,7 @@ public:
if (pInstance->GetData(TYPE_BARON_RUN) != NOT_STARTED) if (pInstance->GetData(TYPE_BARON_RUN) != NOT_STARTED)
return false; return false;
if (Group *pGroup = pPlayer->GetGroup()) if (Group *pGroup = player->GetGroup())
{ {
for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
{ {
@@ -66,10 +66,10 @@ public:
pGroupie->GetMap() == pGo->GetMap()) pGroupie->GetMap() == pGo->GetMap())
pGroupie->CastSpell(pGroupie, SPELL_BARON_ULTIMATUM, true); pGroupie->CastSpell(pGroupie, SPELL_BARON_ULTIMATUM, true);
} }
} else if (pPlayer->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && } else if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE &&
!pPlayer->HasAura(SPELL_BARON_ULTIMATUM) && !player->HasAura(SPELL_BARON_ULTIMATUM) &&
pPlayer->GetMap() == pGo->GetMap()) player->GetMap() == pGo->GetMap())
pPlayer->CastSpell(pPlayer, SPELL_BARON_ULTIMATUM, true); player->CastSpell(player, SPELL_BARON_ULTIMATUM, true);
pInstance->SetData(TYPE_BARON_RUN, IN_PROGRESS); pInstance->SetData(TYPE_BARON_RUN, IN_PROGRESS);
return false; return false;
@@ -258,7 +258,7 @@ public:
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void ReceiveEmote(Player* pPlayer, uint32 emote) void ReceiveEmote(Player* player, uint32 emote)
{ {
switch(emote) switch(emote)
{ {
@@ -266,8 +266,8 @@ public:
EnterEvadeMode(); EnterEvadeMode();
break; break;
case TEXT_EMOTE_RUDE: case TEXT_EMOTE_RUDE:
if (me->IsWithinDistInMap(pPlayer, 5)) if (me->IsWithinDistInMap(player, 5))
DoCast(pPlayer, SPELL_SLAP, false); DoCast(player, SPELL_SLAP, false);
else else
me->HandleEmoteCommand(EMOTE_ONESHOT_RUDE); me->HandleEmoteCommand(EMOTE_ONESHOT_RUDE);
break; break;
src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
+5 -5
View File
@@ -39,10 +39,10 @@ class at_malfurion_stormrage : public AreaTriggerScript
public: public:
at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { }
bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) bool OnTrigger(Player* player, const AreaTriggerEntry * /*at*/)
{ {
if (pPlayer->GetInstanceScript() && !pPlayer->FindNearestCreature(15362, 15)) if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15))
pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000);
return false; return false;
} }
@@ -56,9 +56,9 @@ class go_atalai_statue : public GameObjectScript
public: public:
go_atalai_statue() : GameObjectScript("go_atalai_statue") { } go_atalai_statue() : GameObjectScript("go_atalai_statue") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo) bool OnGossipHello(Player* player, GameObject* pGo)
{ {
if (InstanceScript* pInstance = pPlayer->GetInstanceScript()) if (InstanceScript* pInstance = player->GetInstanceScript())
pInstance->SetData(EVENT_STATE, pGo->GetEntry()); pInstance->SetData(EVENT_STATE, pGo->GetEntry());
return false; return false;
} }
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+7 -7
View File
@@ -377,9 +377,9 @@ public:
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
Player* pPlayer = itr->getSource(); Player* player = itr->getSource();
if (pPlayer) if (player)
me->GetMap()->ToInstanceMap()->PermBindAllPlayers(pPlayer); me->GetMap()->ToInstanceMap()->PermBindAllPlayers(player);
} }
} }
} }
@@ -543,7 +543,7 @@ class kalecgos_teleporter : public GameObjectScript
public: public:
kalecgos_teleporter() : GameObjectScript("kalecgos_teleporter") { } kalecgos_teleporter() : GameObjectScript("kalecgos_teleporter") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo) bool OnGossipHello(Player* player, GameObject* pGo)
{ {
uint8 SpectralPlayers = 0; uint8 SpectralPlayers = 0;
Map* pMap = pGo->GetMap(); Map* pMap = pGo->GetMap();
@@ -557,10 +557,10 @@ public:
++SpectralPlayers; ++SpectralPlayers;
} }
uint8 MaxSpectralPlayers = MAX_PLAYERS_IN_SPECTRAL_REALM; uint8 MaxSpectralPlayers = MAX_PLAYERS_IN_SPECTRAL_REALM;
if (pPlayer->HasAura(AURA_SPECTRAL_EXHAUSTION) || (MaxSpectralPlayers && SpectralPlayers >= MaxSpectralPlayers)) if (player->HasAura(AURA_SPECTRAL_EXHAUSTION) || (MaxSpectralPlayers && SpectralPlayers >= MaxSpectralPlayers))
pPlayer->GetSession()->SendNotification(GO_FAILED); player->GetSession()->SendNotification(GO_FAILED);
else else
pPlayer->CastSpell(pPlayer, SPELL_TELEPORT_SPECTRAL, true); player->CastSpell(player, SPELL_TELEPORT_SPECTRAL, true);
return true; return true;
} }
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+4 -4
View File
@@ -374,16 +374,16 @@ class go_orb_of_the_blue_flight : public GameObjectScript
public: public:
go_orb_of_the_blue_flight() : GameObjectScript("go_orb_of_the_blue_flight") { } go_orb_of_the_blue_flight() : GameObjectScript("go_orb_of_the_blue_flight") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo) bool OnGossipHello(Player* player, GameObject* pGo)
{ {
if (pGo->GetUInt32Value(GAMEOBJECT_FACTION) == 35) if (pGo->GetUInt32Value(GAMEOBJECT_FACTION) == 35)
{ {
InstanceScript* pInstance = pGo->GetInstanceScript(); InstanceScript* pInstance = pGo->GetInstanceScript();
pPlayer->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000); player->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000);
pPlayer->CastSpell(pPlayer, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, false); player->CastSpell(player, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, false);
pGo->SetUInt32Value(GAMEOBJECT_FACTION, 0); pGo->SetUInt32Value(GAMEOBJECT_FACTION, 0);
if (Creature* pKalec = Unit::GetCreature(*pPlayer, pInstance->GetData64(DATA_KALECGOS_KJ))) if (Creature* pKalec = Unit::GetCreature(*player, pInstance->GetData64(DATA_KALECGOS_KJ)))
CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->SetRingOfBlueFlames(); CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->SetRingOfBlueFlames();
pGo->Refresh(); pGo->Refresh();
src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+7 -7
View File
@@ -394,15 +394,15 @@ class go_altar_of_archaedas : public GameObjectScript
{ {
} }
bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{ {
InstanceScript* pInstance = pPlayer->GetInstanceScript(); InstanceScript* pInstance = player->GetInstanceScript();
if (!pInstance) if (!pInstance)
return false; return false;
pPlayer->CastSpell (pPlayer, SPELL_BOSS_OBJECT_VISUAL, false); player->CastSpell (player, SPELL_BOSS_OBJECT_VISUAL, false);
pInstance->SetData64(0, pPlayer->GetGUID()); // activate archaedas pInstance->SetData64(0, player->GetGUID()); // activate archaedas
return false; return false;
} }
}; };
@@ -425,13 +425,13 @@ class go_altar_of_the_keepers : public GameObjectScript
{ {
} }
bool OnGossipHello(Player* pPlayer, GameObject* /*pGo*/) bool OnGossipHello(Player* player, GameObject* /*pGo*/)
{ {
InstanceScript* pInstance = pPlayer->GetInstanceScript(); InstanceScript* pInstance = player->GetInstanceScript();
if (!pInstance) if (!pInstance)
return false; return false;
pPlayer->CastSpell (pPlayer, SPELL_BOSS_OBJECT_VISUAL, false); player->CastSpell (player, SPELL_BOSS_OBJECT_VISUAL, false);
pInstance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate the Stone Keepers pInstance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate the Stone Keepers
return false; return false;
src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+42 -42
View File
@@ -110,7 +110,7 @@ class go_keystone_chamber : public GameObjectScript
public: public:
go_keystone_chamber() : GameObjectScript("go_keystone_chamber") { } go_keystone_chamber() : GameObjectScript("go_keystone_chamber") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{ {
if (InstanceScript* pInstance = pGo->GetInstanceScript()) if (InstanceScript* pInstance = pGo->GetInstanceScript())
pInstance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state. pInstance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state.
@@ -134,10 +134,10 @@ class AreaTrigger_at_map_chamber : public AreaTriggerScript
{ {
} }
bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*trigger*/) bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/)
{ {
if (pPlayer->GetQuestStatus(QUEST_HIDDEN_CHAMBER) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_HIDDEN_CHAMBER) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(QUEST_HIDDEN_CHAMBER); player->AreaExploredOrEventHappens(QUEST_HIDDEN_CHAMBER);
return true; return true;
} }
@@ -173,84 +173,84 @@ class npc_lore_keeper_of_norgannon : public CreatureScript
{ {
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(2278) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(2278) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_KEEPER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_KEEPER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(1079, creature->GetGUID()); player->SEND_GOSSIP_MENU(1079, creature->GetGUID());
return true; 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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(1080, creature->GetGUID()); player->SEND_GOSSIP_MENU(1080, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(1081, creature->GetGUID()); player->SEND_GOSSIP_MENU(1081, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(1082, creature->GetGUID()); player->SEND_GOSSIP_MENU(1082, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(1083, creature->GetGUID()); player->SEND_GOSSIP_MENU(1083, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(1084, creature->GetGUID()); player->SEND_GOSSIP_MENU(1084, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
pPlayer->SEND_GOSSIP_MENU(1085, creature->GetGUID()); player->SEND_GOSSIP_MENU(1085, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
pPlayer->SEND_GOSSIP_MENU(1086, creature->GetGUID()); player->SEND_GOSSIP_MENU(1086, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+8: case GOSSIP_ACTION_INFO_DEF+8:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
pPlayer->SEND_GOSSIP_MENU(1087, creature->GetGUID()); player->SEND_GOSSIP_MENU(1087, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+9: case GOSSIP_ACTION_INFO_DEF+9:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
pPlayer->SEND_GOSSIP_MENU(1088, creature->GetGUID()); player->SEND_GOSSIP_MENU(1088, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+10: case GOSSIP_ACTION_INFO_DEF+10:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+11); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+11);
pPlayer->SEND_GOSSIP_MENU(1089, creature->GetGUID()); player->SEND_GOSSIP_MENU(1089, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+11: case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+12); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+12);
pPlayer->SEND_GOSSIP_MENU(1090, creature->GetGUID()); player->SEND_GOSSIP_MENU(1090, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+12: case GOSSIP_ACTION_INFO_DEF+12:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+13); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+13);
pPlayer->SEND_GOSSIP_MENU(1091, creature->GetGUID()); player->SEND_GOSSIP_MENU(1091, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+13: case GOSSIP_ACTION_INFO_DEF+13:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+14); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+14);
pPlayer->SEND_GOSSIP_MENU(1092, creature->GetGUID()); player->SEND_GOSSIP_MENU(1092, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+14: case GOSSIP_ACTION_INFO_DEF+14:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+15); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+15);
pPlayer->SEND_GOSSIP_MENU(1093, creature->GetGUID()); player->SEND_GOSSIP_MENU(1093, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+15: case GOSSIP_ACTION_INFO_DEF+15:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+16); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KEEPER15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+16);
pPlayer->SEND_GOSSIP_MENU(1094, creature->GetGUID()); player->SEND_GOSSIP_MENU(1094, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+16: case GOSSIP_ACTION_INFO_DEF+16:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(2278); player->AreaExploredOrEventHappens(2278);
break; break;
} }
return true; return true;
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+8 -8
View File
@@ -135,8 +135,8 @@ class npc_zulaman_hostage : public CreatureScript
void EnterCombat(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* /*who*/) void JustDied(Unit* /*who*/)
{ {
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer) pPlayer->SendLoot(me->GetGUID(), LOOT_CORPSE); if (player) player->SendLoot(me->GetGUID(), LOOT_CORPSE);
} }
void UpdateAI(const uint32 /*diff*/) void UpdateAI(const uint32 /*diff*/)
{ {
@@ -150,18 +150,18 @@ class npc_zulaman_hostage : public CreatureScript
return new npc_zulaman_hostageAI(creature); return new npc_zulaman_hostageAI(creature);
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, 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; 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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (!creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) if (!creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
return true; return true;
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+1 -1
View File
@@ -269,7 +269,7 @@ class go_gong_of_bethekk : public GameObjectScript
{ {
} }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{ {
if (InstanceScript* m_pInstance = pGo->GetInstanceScript()) if (InstanceScript* m_pInstance = pGo->GetInstanceScript())
{ {
src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+10 -10
View File
@@ -66,15 +66,15 @@ class npc_professor_phizzlethorpe : public CreatureScript
void WaypointReached(uint32 uiPointId) void WaypointReached(uint32 uiPointId)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(uiPointId) switch(uiPointId)
{ {
case 4:DoScriptText(SAY_PROGRESS_2, me, pPlayer);break; case 4:DoScriptText(SAY_PROGRESS_2, me, player);break;
case 5:DoScriptText(SAY_PROGRESS_3, me, pPlayer);break; case 5:DoScriptText(SAY_PROGRESS_3, me, player);break;
case 8:DoScriptText(EMOTE_PROGRESS_4, me);break; case 8:DoScriptText(EMOTE_PROGRESS_4, me);break;
case 9: case 9:
{ {
@@ -82,17 +82,17 @@ class npc_professor_phizzlethorpe : public CreatureScript
me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
break; break;
} }
case 10:DoScriptText(SAY_PROGRESS_5, me, pPlayer);break; case 10:DoScriptText(SAY_PROGRESS_5, me, player);break;
case 11: case 11:
DoScriptText(SAY_PROGRESS_6, me, pPlayer); DoScriptText(SAY_PROGRESS_6, me, player);
SetRun(); SetRun();
break; break;
case 19:DoScriptText(SAY_PROGRESS_7, me, pPlayer); break; case 19:DoScriptText(SAY_PROGRESS_7, me, player); break;
case 20: case 20:
DoScriptText(EMOTE_PROGRESS_8, me); DoScriptText(EMOTE_PROGRESS_8, me);
DoScriptText(SAY_PROGRESS_9, me, pPlayer); DoScriptText(SAY_PROGRESS_9, me, player);
if (pPlayer) if (player)
CAST_PLR(pPlayer)->GroupEventHappens(QUEST_SUNKEN_TREASURE, me); CAST_PLR(player)->GroupEventHappens(QUEST_SUNKEN_TREASURE, me);
break; break;
} }
} }
src/server/scripts/EasternKingdoms/blasted_lands.cpp
+41 -41
View File
@@ -45,24 +45,24 @@ class npc_deathly_usher : public CreatureScript
public: public:
npc_deathly_usher() : CreatureScript("npc_deathly_usher") { } npc_deathly_usher() : CreatureScript("npc_deathly_usher") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true); creature->CastSpell(player, SPELL_TELEPORT_SINGLE, true);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(10757, 1)) if (player->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(10757, 1))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -88,73 +88,73 @@ class npc_fallen_hero_of_horde : public CreatureScript
public: public:
npc_fallen_hero_of_horde() : CreatureScript("npc_fallen_hero_of_horde") { } npc_fallen_hero_of_horde() : CreatureScript("npc_fallen_hero_of_horde") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(1392, creature->GetGUID()); player->SEND_GOSSIP_MENU(1392, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+11: case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->SEND_GOSSIP_MENU(1411, creature->GetGUID()); player->SEND_GOSSIP_MENU(1411, creature->GetGUID());
if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(2784); player->AreaExploredOrEventHappens(2784);
if (pPlayer->GetTeam() == ALLIANCE) if (player->GetTeam() == ALLIANCE)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(1411, creature->GetGUID()); player->SEND_GOSSIP_MENU(1411, creature->GetGUID());
} }
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
pPlayer->SEND_GOSSIP_MENU(1451, creature->GetGUID()); player->SEND_GOSSIP_MENU(1451, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+21: case GOSSIP_ACTION_INFO_DEF+21:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
pPlayer->SEND_GOSSIP_MENU(1452, creature->GetGUID()); player->SEND_GOSSIP_MENU(1452, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+22: case GOSSIP_ACTION_INFO_DEF+22:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
pPlayer->SEND_GOSSIP_MENU(1453, creature->GetGUID()); player->SEND_GOSSIP_MENU(1453, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+23: case GOSSIP_ACTION_INFO_DEF+23:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
pPlayer->SEND_GOSSIP_MENU(1454, creature->GetGUID()); player->SEND_GOSSIP_MENU(1454, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+24: case GOSSIP_ACTION_INFO_DEF+24:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
pPlayer->SEND_GOSSIP_MENU(1455, creature->GetGUID()); player->SEND_GOSSIP_MENU(1455, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+25: case GOSSIP_ACTION_INFO_DEF+25:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
pPlayer->SEND_GOSSIP_MENU(1456, creature->GetGUID()); player->SEND_GOSSIP_MENU(1456, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+26: case GOSSIP_ACTION_INFO_DEF+26:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(2801); player->AreaExploredOrEventHappens(2801);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == HORDE) if (player->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && player->GetTeam() == HORDE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE) if (player->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && player->GetTeam() == ALLIANCE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, 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; return true;
} }
src/server/scripts/EasternKingdoms/burning_steppes.cpp
+31 -31
View File
@@ -51,72 +51,72 @@ class npc_ragged_john : public CreatureScript
public: public:
npc_ragged_john() : CreatureScript("npc_ragged_john") { } npc_ragged_john() : CreatureScript("npc_ragged_john") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2714, creature->GetGUID()); player->SEND_GOSSIP_MENU(2714, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(2715, creature->GetGUID()); player->SEND_GOSSIP_MENU(2715, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(2716, creature->GetGUID()); player->SEND_GOSSIP_MENU(2716, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(2717, creature->GetGUID()); player->SEND_GOSSIP_MENU(2717, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
pPlayer->SEND_GOSSIP_MENU(2718, creature->GetGUID()); player->SEND_GOSSIP_MENU(2718, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
pPlayer->SEND_GOSSIP_MENU(2719, creature->GetGUID()); player->SEND_GOSSIP_MENU(2719, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
pPlayer->SEND_GOSSIP_MENU(2720, creature->GetGUID()); player->SEND_GOSSIP_MENU(2720, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
pPlayer->SEND_GOSSIP_MENU(2721, creature->GetGUID()); player->SEND_GOSSIP_MENU(2721, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+8: case GOSSIP_ACTION_INFO_DEF+8:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
pPlayer->SEND_GOSSIP_MENU(2722, creature->GetGUID()); player->SEND_GOSSIP_MENU(2722, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+9: case GOSSIP_ACTION_INFO_DEF+9:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
pPlayer->SEND_GOSSIP_MENU(2723, creature->GetGUID()); player->SEND_GOSSIP_MENU(2723, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+10: case GOSSIP_ACTION_INFO_DEF+10:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(2725, creature->GetGUID()); player->SEND_GOSSIP_MENU(2725, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+11: case GOSSIP_ACTION_INFO_DEF+11:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(4224); player->AreaExploredOrEventHappens(4224);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(2713, creature->GetGUID()); player->SEND_GOSSIP_MENU(2713, creature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/duskwood.cpp
+5 -5
View File
@@ -34,20 +34,20 @@ class at_twilight_grove : public AreaTriggerScript
public: public:
at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { } at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { }
bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) bool OnTrigger(Player* player, const AreaTriggerEntry * /*at*/)
{ {
if (pPlayer->HasQuestForItem(21149)) if (player->HasQuestForItem(21149))
{ {
if (Unit* TCorrupter = pPlayer->SummonCreature(15625, -10328.16f, -489.57f, 49.95f, 0, TEMPSUMMON_MANUAL_DESPAWN, 60000)) if (Unit* TCorrupter = player->SummonCreature(15625, -10328.16f, -489.57f, 49.95f, 0, TEMPSUMMON_MANUAL_DESPAWN, 60000))
{ {
TCorrupter->setFaction(14); TCorrupter->setFaction(14);
TCorrupter->SetMaxHealth(832750); TCorrupter->SetMaxHealth(832750);
} }
if (Unit* CorrupterSpeaker = pPlayer->SummonCreature(1, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ()-1, 0, TEMPSUMMON_TIMED_DESPAWN, 15000)) if (Unit* CorrupterSpeaker = player->SummonCreature(1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()-1, 0, TEMPSUMMON_TIMED_DESPAWN, 15000))
{ {
CorrupterSpeaker->SetName("Twilight Corrupter"); CorrupterSpeaker->SetName("Twilight Corrupter");
CorrupterSpeaker->SetVisible(true); CorrupterSpeaker->SetVisible(true);
CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...", 0, pPlayer->GetGUID()); CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...", 0, player->GetGUID());
} }
} }
return false; return false;
src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
+26 -26
View File
@@ -72,23 +72,23 @@ class npc_augustus_the_touched : public CreatureScript
public: public:
npc_augustus_the_touched() : CreatureScript("npc_augustus_the_touched") { } npc_augustus_the_touched() : CreatureScript("npc_augustus_the_touched") { }
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) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->GetSession()->SendListInventory(creature->GetGUID()); player->GetSession()->SendListInventory(creature->GetGUID());
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetQuestRewardStatus(6164)) if (creature->isVendor() && player->GetQuestRewardStatus(6164))
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);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -105,10 +105,10 @@ class npc_darrowshire_spirit : public CreatureScript
public: public:
npc_darrowshire_spirit() : CreatureScript("npc_darrowshire_spirit") { } npc_darrowshire_spirit() : CreatureScript("npc_darrowshire_spirit") { }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->SEND_GOSSIP_MENU(3873, creature->GetGUID()); player->SEND_GOSSIP_MENU(3873, creature->GetGUID());
pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return true; return true;
} }
@@ -148,40 +148,40 @@ class npc_tirion_fordring : public CreatureScript
public: public:
npc_tirion_fordring() : CreatureScript("npc_tirion_fordring") { } npc_tirion_fordring() : CreatureScript("npc_tirion_fordring") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(4493, creature->GetGUID()); player->SEND_GOSSIP_MENU(4493, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(4494, creature->GetGUID()); player->SEND_GOSSIP_MENU(4494, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(4495, creature->GetGUID()); player->SEND_GOSSIP_MENU(4495, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(5742); player->AreaExploredOrEventHappens(5742);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && pPlayer->getStandState() == UNIT_STAND_STATE_SIT) if (player->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && player->getStandState() == UNIT_STAND_STATE_SIT)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, 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; return true;
} }
src/server/scripts/EasternKingdoms/eversong_woods.cpp
+30 -30
View File
@@ -53,30 +53,30 @@ class npc_prospector_anvilward : public CreatureScript
public: public:
npc_prospector_anvilward() : CreatureScript("npc_prospector_anvilward") { } npc_prospector_anvilward() : CreatureScript("npc_prospector_anvilward") { }
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) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(8240, creature->GetGUID()); player->SEND_GOSSIP_MENU(8240, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (npc_escortAI* pEscortAI = CAST_AI(npc_prospector_anvilward::npc_prospector_anvilwardAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_prospector_anvilward::npc_prospector_anvilwardAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(8239, creature->GetGUID()); player->SEND_GOSSIP_MENU(8239, creature->GetGUID());
return true; return true;
} }
@@ -93,15 +93,15 @@ public:
// Pure Virtual Functions // Pure Virtual Functions
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch (i) switch (i)
{ {
case 0: DoScriptText(SAY_ANVIL1, me, pPlayer); break; case 0: DoScriptText(SAY_ANVIL1, me, player); break;
case 5: DoScriptText(SAY_ANVIL2, me, pPlayer); break; case 5: DoScriptText(SAY_ANVIL2, me, player); break;
case 6: me->setFaction(24); break; case 6: me->setFaction(24); break;
} }
} }
@@ -346,7 +346,7 @@ class npc_second_trial_controller : public CreatureScript
public: public:
npc_second_trial_controller() : CreatureScript("npc_second_trial_controller") { } npc_second_trial_controller() : CreatureScript("npc_second_trial_controller") { }
bool OnQuestAccept(Player* /*pPlayer*/, Creature* creature, Quest const *quest) bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const *quest)
{ {
// One Player exclusive quest, wait for user go activation // One Player exclusive quest, wait for user go activation
if (quest->GetQuestId() == QUEST_SECOND_TRIAL) if (quest->GetQuestId() == QUEST_SECOND_TRIAL)
@@ -355,7 +355,7 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
// quest only available if not already started // quest only available if not already started
// Quest_template flag is set to : QUEST_FLAGS_EVENT // Quest_template flag is set to : QUEST_FLAGS_EVENT
@@ -364,11 +364,11 @@ public:
if (CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, creature->AI())->questPhase == 0) if (CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, creature->AI())->questPhase == 0)
{ {
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
pPlayer->SendPreparedQuest(creature->GetGUID()); player->SendPreparedQuest(creature->GetGUID());
} }
pPlayer->SEND_GOSSIP_MENU(creature->GetEntry(), creature->GetGUID()); player->SEND_GOSSIP_MENU(creature->GetEntry(), creature->GetGUID());
return true; return true;
} }
@@ -505,7 +505,7 @@ class go_second_trial : public GameObjectScript
public: public:
go_second_trial() : GameObjectScript("go_second_trial") { } go_second_trial() : GameObjectScript("go_second_trial") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{ {
// find spawn :: master_kelerun_bloodmourn // find spawn :: master_kelerun_bloodmourn
if (Creature* creature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) if (Creature* creature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f))
@@ -529,12 +529,12 @@ class npc_apprentice_mirveda : public CreatureScript
public: public:
npc_apprentice_mirveda() : CreatureScript("npc_apprentice_mirveda") { } npc_apprentice_mirveda() : CreatureScript("npc_apprentice_mirveda") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT) if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT)
{ {
CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, creature->AI())->Summon = true; CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, creature->AI())->Summon = true;
CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, creature->AI())->PlayerGUID = player->GetGUID();
} }
return true; return true;
} }
@@ -578,15 +578,15 @@ public:
void JustDied(Unit* /*killer*/) void JustDied(Unit* /*killer*/)
{ {
if (PlayerGUID) if (PlayerGUID)
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
CAST_PLR(pPlayer)->FailQuest(QUEST_UNEXPECTED_RESULT); CAST_PLR(player)->FailQuest(QUEST_UNEXPECTED_RESULT);
} }
void UpdateAI(const uint32 /*diff*/) void UpdateAI(const uint32 /*diff*/)
{ {
if (KillCount >= 3 && PlayerGUID) if (KillCount >= 3 && PlayerGUID)
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
CAST_PLR(pPlayer)->CompleteQuest(QUEST_UNEXPECTED_RESULT); CAST_PLR(player)->CompleteQuest(QUEST_UNEXPECTED_RESULT);
if (Summon) if (Summon)
{ {
@@ -676,8 +676,8 @@ public:
void JustDied(Unit* /*killer*/) void JustDied(Unit* /*killer*/)
{ {
if (PlayerGUID && !Completed) if (PlayerGUID && !Completed)
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
CAST_PLR(pPlayer)->FailQuest(QUEST_POWERING_OUR_DEFENSES); CAST_PLR(player)->FailQuest(QUEST_POWERING_OUR_DEFENSES);
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
@@ -687,8 +687,8 @@ public:
DoScriptText(EMOTE, me); DoScriptText(EMOTE, me);
Completed = true; Completed = true;
if (PlayerGUID) if (PlayerGUID)
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
CAST_PLR(pPlayer)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES); CAST_PLR(player)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES);
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
me->RemoveCorpse(); me->RemoveCorpse();
src/server/scripts/EasternKingdoms/ghostlands.cpp
+41 -41
View File
@@ -44,28 +44,28 @@ class npc_blood_knight_dawnstar : public CreatureScript
public: public:
npc_blood_knight_dawnstar() : CreatureScript("npc_blood_knight_dawnstar") { } npc_blood_knight_dawnstar() : CreatureScript("npc_blood_knight_dawnstar") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, NULL); uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, NULL);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
pPlayer->StoreNewItem(dest, 24226, 1, true); player->StoreNewItem(dest, 24226, 1, true);
pPlayer->PlayerTalkClass->ClearMenus(); player->PlayerTalkClass->ClearMenus();
} }
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226, 1, true)) if (player->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(24226, 1, true))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, 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; return true;
} }
@@ -83,26 +83,26 @@ class npc_budd_nedreck : public CreatureScript
public: public:
npc_budd_nedreck() : CreatureScript("npc_budd_nedreck") { } npc_budd_nedreck() : CreatureScript("npc_budd_nedreck") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 42540, false); creature->CastSpell(player, 42540, false);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -117,25 +117,25 @@ class npc_rathis_tomber : public CreatureScript
public: public:
npc_rathis_tomber() : CreatureScript("npc_rathis_tomber") { } npc_rathis_tomber() : CreatureScript("npc_rathis_tomber") { }
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) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->GetSession()->SendListInventory(creature->GetGUID()); player->GetSession()->SendListInventory(creature->GetGUID());
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetQuestRewardStatus(9152)) if (creature->isVendor() && player->GetQuestRewardStatus(9152))
{ {
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);
pPlayer->SEND_GOSSIP_MENU(8432, creature->GetGUID()); player->SEND_GOSSIP_MENU(8432, creature->GetGUID());
}else }else
pPlayer->SEND_GOSSIP_MENU(8431, creature->GetGUID()); player->SEND_GOSSIP_MENU(8431, creature->GetGUID());
return true; return true;
} }
@@ -173,9 +173,9 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(i) switch(i)
@@ -185,24 +185,24 @@ public:
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20)) if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20))
Cage->SetGoState(GO_STATE_ACTIVE); Cage->SetGoState(GO_STATE_ACTIVE);
DoScriptText(SAY_START, me, pPlayer); DoScriptText(SAY_START, me, player);
break; break;
} }
case 5: case 5:
DoScriptText(SAY_PROGRESS1, me, pPlayer); DoScriptText(SAY_PROGRESS1, me, player);
case 11: case 11:
DoScriptText(SAY_PROGRESS2, me, pPlayer); DoScriptText(SAY_PROGRESS2, me, player);
me->SetOrientation(4.762841f); me->SetOrientation(4.762841f);
break; break;
case 18: case 18:
{ {
DoScriptText(SAY_PROGRESS3, me, pPlayer); DoScriptText(SAY_PROGRESS3, me, player);
Creature* Summ1 = me->SummonCreature(16342, 7627.083984f, -7532.538086f, 152.128616f, 1.082733f, TEMPSUMMON_DEAD_DESPAWN, 0); Creature* Summ1 = me->SummonCreature(16342, 7627.083984f, -7532.538086f, 152.128616f, 1.082733f, TEMPSUMMON_DEAD_DESPAWN, 0);
Creature* Summ2 = me->SummonCreature(16343, 7620.432129f, -7532.550293f, 152.454865f, 0.827478f, TEMPSUMMON_DEAD_DESPAWN, 0); Creature* Summ2 = me->SummonCreature(16343, 7620.432129f, -7532.550293f, 152.454865f, 0.827478f, TEMPSUMMON_DEAD_DESPAWN, 0);
if (Summ1 && Summ2) if (Summ1 && Summ2)
{ {
Summ1->Attack(me, true); Summ1->Attack(me, true);
Summ2->Attack(pPlayer, true); Summ2->Attack(player, true);
} }
me->AI()->AttackStart(Summ1); me->AI()->AttackStart(Summ1);
break; break;
@@ -210,19 +210,19 @@ public:
case 19: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break; case 19: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break;
case 25: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); break; case 25: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); break;
case 30: case 30:
if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) if (player && player->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS, me); CAST_PLR(player)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS, me);
break; break;
case 32: case 32:
me->SetOrientation(2.978281f); me->SetOrientation(2.978281f);
DoScriptText(SAY_END1, me, pPlayer); DoScriptText(SAY_END1, me, player);
break; break;
case 33: case 33:
me->SetOrientation(5.858011f); me->SetOrientation(5.858011f);
DoScriptText(SAY_END2, me, pPlayer); DoScriptText(SAY_END2, me, player);
Unit* CaptainHelios = me->FindNearestCreature(NPC_CAPTAIN_HELIOS, 50); Unit* CaptainHelios = me->FindNearestCreature(NPC_CAPTAIN_HELIOS, 50);
if (CaptainHelios) if (CaptainHelios)
DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, pPlayer); DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, player);
break; break;
} }
} }
@@ -234,14 +234,14 @@ public:
} }
}; };
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS) if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS)
{ {
creature->setFaction(113); creature->setFaction(113);
if (npc_escortAI* pEscortAI = CAST_AI(npc_ranger_lilatha::npc_ranger_lilathaAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_ranger_lilatha::npc_ranger_lilathaAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
} }
return true; return true;
} }
src/server/scripts/EasternKingdoms/hinterlands.cpp
+17 -17
View File
@@ -57,21 +57,21 @@ class npc_00x09hl : public CreatureScript
public: public:
npc_00x09hl() : CreatureScript("npc_00x09hl") { } npc_00x09hl() : CreatureScript("npc_00x09hl") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_RESQUE_OOX_09) if (pQuest->GetQuestId() == QUEST_RESQUE_OOX_09)
{ {
creature->SetStandState(UNIT_STAND_STATE_STAND); creature->SetStandState(UNIT_STAND_STATE_STAND);
if (pPlayer->GetTeam() == ALLIANCE) if (player->GetTeam() == ALLIANCE)
creature->setFaction(FACTION_ESCORTEE_A); creature->setFaction(FACTION_ESCORTEE_A);
else if (pPlayer->GetTeam() == HORDE) else if (player->GetTeam() == HORDE)
creature->setFaction(FACTION_ESCORTEE_H); creature->setFaction(FACTION_ESCORTEE_H);
DoScriptText(SAY_OOX_START, creature, pPlayer); DoScriptText(SAY_OOX_START, creature, player);
if (npc_00x09hlAI* pEscortAI = CAST_AI(npc_00x09hl::npc_00x09hlAI, creature->AI())) if (npc_00x09hlAI* pEscortAI = CAST_AI(npc_00x09hl::npc_00x09hlAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); pEscortAI->Start(false, false, player->GetGUID(), pQuest);
} }
return true; return true;
} }
@@ -99,8 +99,8 @@ public:
break; break;
case 64: case 64:
DoScriptText(SAY_OOX_END, me); DoScriptText(SAY_OOX_END, me);
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
pPlayer->GroupEventHappens(QUEST_RESQUE_OOX_09, me); player->GroupEventHappens(QUEST_RESQUE_OOX_09, me);
break; break;
} }
} }
@@ -191,7 +191,7 @@ class npc_rinji : public CreatureScript
public: public:
npc_rinji() : CreatureScript("npc_rinji") { } npc_rinji() : CreatureScript("npc_rinji") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_RINJI_TRAPPED) if (pQuest->GetQuestId() == QUEST_RINJI_TRAPPED)
{ {
@@ -199,7 +199,7 @@ public:
pGo->UseDoorOrButton(); pGo->UseDoorOrButton();
if (npc_rinjiAI* pEscortAI = CAST_AI(npc_rinji::npc_rinjiAI, creature->AI())) if (npc_rinjiAI* pEscortAI = CAST_AI(npc_rinji::npc_rinjiAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); pEscortAI->Start(false, false, player->GetGUID(), pQuest);
} }
return true; return true;
} }
@@ -279,15 +279,15 @@ public:
void WaypointReached(uint32 uiPointId) void WaypointReached(uint32 uiPointId)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(uiPointId) switch(uiPointId)
{ {
case 1: case 1:
DoScriptText(SAY_RIN_FREE, me, pPlayer); DoScriptText(SAY_RIN_FREE, me, player);
break; break;
case 7: case 7:
DoSpawnAmbush(true); DoSpawnAmbush(true);
@@ -296,8 +296,8 @@ public:
DoSpawnAmbush(false); DoSpawnAmbush(false);
break; break;
case 17: case 17:
DoScriptText(SAY_RIN_COMPLETE, me, pPlayer); DoScriptText(SAY_RIN_COMPLETE, me, player);
pPlayer->GroupEventHappens(QUEST_RINJI_TRAPPED, me); player->GroupEventHappens(QUEST_RINJI_TRAPPED, me);
SetRun(); SetRun();
m_uiPostEventCount = 1; m_uiPostEventCount = 1;
break; break;
@@ -315,16 +315,16 @@ public:
{ {
m_uiPostEventTimer = 3000; m_uiPostEventTimer = 3000;
if (Unit* pPlayer = GetPlayerForEscort()) if (Unit* player = GetPlayerForEscort())
{ {
switch(m_uiPostEventCount) switch(m_uiPostEventCount)
{ {
case 1: case 1:
DoScriptText(SAY_RIN_PROGRESS_1, me, pPlayer); DoScriptText(SAY_RIN_PROGRESS_1, me, player);
++m_uiPostEventCount; ++m_uiPostEventCount;
break; break;
case 2: case 2:
DoScriptText(SAY_RIN_PROGRESS_2, me, pPlayer); DoScriptText(SAY_RIN_PROGRESS_2, me, player);
m_uiPostEventCount = 0; m_uiPostEventCount = 0;
break; break;
} }
src/server/scripts/EasternKingdoms/ironforge.cpp
+18 -18
View File
@@ -44,47 +44,47 @@ class npc_royal_historian_archesonus : public CreatureScript
public: public:
npc_royal_historian_archesonus() : CreatureScript("npc_royal_historian_archesonus") { } npc_royal_historian_archesonus() : CreatureScript("npc_royal_historian_archesonus") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2236, creature->GetGUID()); player->SEND_GOSSIP_MENU(2236, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(2237, creature->GetGUID()); player->SEND_GOSSIP_MENU(2237, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(2238, creature->GetGUID()); player->SEND_GOSSIP_MENU(2238, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(2239, creature->GetGUID()); player->SEND_GOSSIP_MENU(2239, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(3702); player->AreaExploredOrEventHappens(3702);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(3702) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(3702) == QUEST_STATUS_INCOMPLETE)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(2235, creature->GetGUID()); player->SEND_GOSSIP_MENU(2235, creature->GetGUID());
} }
else else
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/loch_modan.cpp
+20 -20
View File
@@ -47,51 +47,51 @@ class npc_mountaineer_pebblebitty : public CreatureScript
public: public:
npc_mountaineer_pebblebitty() : CreatureScript("npc_mountaineer_pebblebitty") { } npc_mountaineer_pebblebitty() : CreatureScript("npc_mountaineer_pebblebitty") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(1833, creature->GetGUID()); player->SEND_GOSSIP_MENU(1833, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(1834, creature->GetGUID()); player->SEND_GOSSIP_MENU(1834, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(1835, creature->GetGUID()); player->SEND_GOSSIP_MENU(1835, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
pPlayer->SEND_GOSSIP_MENU(1836, creature->GetGUID()); player->SEND_GOSSIP_MENU(1836, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
pPlayer->SEND_GOSSIP_MENU(1837, creature->GetGUID()); player->SEND_GOSSIP_MENU(1837, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
pPlayer->SEND_GOSSIP_MENU(1838, creature->GetGUID()); player->SEND_GOSSIP_MENU(1838, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (!pPlayer->GetQuestRewardStatus(3181) == 1) if (!player->GetQuestRewardStatus(3181) == 1)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP, 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; return true;
} }
src/server/scripts/EasternKingdoms/redridge_mountains.cpp
+5 -5
View File
@@ -43,11 +43,11 @@ class npc_corporal_keeshan : public CreatureScript
public: public:
npc_corporal_keeshan() : CreatureScript("npc_corporal_keeshan") { } npc_corporal_keeshan() : CreatureScript("npc_corporal_keeshan") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *pQuest) bool OnQuestAccept(Player* player, Creature* creature, Quest const *pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_MISSING_IN_ACTION) if (pQuest->GetQuestId() == QUEST_MISSING_IN_ACTION)
{ {
CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, creature->AI())->Start(true, false, pPlayer->GetGUID(), pQuest); CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, creature->AI())->Start(true, false, player->GetGUID(), pQuest);
DoScriptText(SAY_CORPORAL_1, creature); DoScriptText(SAY_CORPORAL_1, creature);
} }
@@ -78,9 +78,9 @@ public:
void WaypointReached(uint32 uiI) void WaypointReached(uint32 uiI)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
if (uiI >= 65 && me->GetUnitMovementFlags() == MOVEMENTFLAG_WALKING) if (uiI >= 65 && me->GetUnitMovementFlags() == MOVEMENTFLAG_WALKING)
@@ -97,7 +97,7 @@ public:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
break; break;
case 115: case 115:
pPlayer->AreaExploredOrEventHappens(QUEST_MISSING_IN_ACTION); player->AreaExploredOrEventHappens(QUEST_MISSING_IN_ACTION);
uiTimer = 2000; uiTimer = 2000;
uiPhase = 4; uiPhase = 4;
break; break;
src/server/scripts/EasternKingdoms/searing_gorge.cpp
+35 -35
View File
@@ -44,36 +44,36 @@ class npc_kalaran_windblade : public CreatureScript
public: public:
npc_kalaran_windblade() : CreatureScript("npc_kalaran_windblade") { } npc_kalaran_windblade() : CreatureScript("npc_kalaran_windblade") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(1954, creature->GetGUID()); player->SEND_GOSSIP_MENU(1954, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_KW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(1955, creature->GetGUID()); player->SEND_GOSSIP_MENU(1955, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(3441); player->AreaExploredOrEventHappens(3441);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(3441) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(3441) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_KW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_KW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -91,27 +91,27 @@ class npc_lothos_riftwaker : public CreatureScript
public: public:
npc_lothos_riftwaker() : CreatureScript("npc_lothos_riftwaker") { } npc_lothos_riftwaker() : CreatureScript("npc_lothos_riftwaker") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->TeleportTo(409, 1096, -467, -104.6f, 3.64f); player->TeleportTo(409, 1096, -467, -104.6f, 3.64f);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestRewardStatus(7487) || pPlayer->GetQuestRewardStatus(7848)) if (player->GetQuestRewardStatus(7487) || player->GetQuestRewardStatus(7848))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LR, 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; return true;
} }
@@ -131,36 +131,36 @@ class npc_zamael_lunthistle : public CreatureScript
public: public:
npc_zamael_lunthistle() : CreatureScript("npc_zamael_lunthistle") { } npc_zamael_lunthistle() : CreatureScript("npc_zamael_lunthistle") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_ZL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_ZL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(1921, creature->GetGUID()); player->SEND_GOSSIP_MENU(1921, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_ZL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_ZL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(1922, creature->GetGUID()); player->SEND_GOSSIP_MENU(1922, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(3377); player->AreaExploredOrEventHappens(3377);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(3377) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(3377) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ZL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ZL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(1920, creature->GetGUID()); player->SEND_GOSSIP_MENU(1920, creature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+31 -31
View File
@@ -49,31 +49,31 @@ public:
return new npc_astor_hadrenAI(creature); return new npc_astor_hadrenAI(creature);
} }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(624, creature->GetGUID()); player->SEND_GOSSIP_MENU(624, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->setFaction(21); creature->setFaction(21);
if (pPlayer) if (player)
CAST_AI(npc_astor_hadren::npc_astor_hadrenAI, creature->AI())->AttackStart(pPlayer); CAST_AI(npc_astor_hadren::npc_astor_hadrenAI, creature->AI())->AttackStart(player);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(1886) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(1886) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(623, creature->GetGUID()); player->SEND_GOSSIP_MENU(623, creature->GetGUID());
return true; return true;
} }
@@ -136,18 +136,18 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(i) switch(i)
{ {
case 1: DoScriptText(SAY_START, me, pPlayer);break; case 1: DoScriptText(SAY_START, me, player);break;
case 13: case 13:
DoScriptText(SAY_LAST, me, pPlayer); DoScriptText(SAY_LAST, me, player);
pPlayer->GroupEventHappens(QUEST_ESCORTING, me); break; player->GroupEventHappens(QUEST_ESCORTING, me); break;
case 14: DoScriptText(SAY_THANKS, me, pPlayer); break; case 14: DoScriptText(SAY_THANKS, me, player); break;
case 15: { case 15: {
Unit* Rane = me->FindNearestCreature(NPC_RANE, 20); Unit* Rane = me->FindNearestCreature(NPC_RANE, 20);
if (Rane) if (Rane)
@@ -174,14 +174,14 @@ public:
} }
}; };
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_ESCORTING) if (quest->GetQuestId() == QUEST_ESCORTING)
{ {
DoScriptText(SAY_QUESTACCEPT, creature, pPlayer); DoScriptText(SAY_QUESTACCEPT, creature, player);
if (npc_escortAI* pEscortAI = CAST_AI(npc_deathstalker_erland::npc_deathstalker_erlandAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_deathstalker_erland::npc_deathstalker_erlandAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
} }
return true; return true;
@@ -225,14 +225,14 @@ class pyrewood_ambush : public CreatureScript
public: public:
pyrewood_ambush() : CreatureScript("pyrewood_ambush") { } pyrewood_ambush() : CreatureScript("pyrewood_ambush") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest *pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest *pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress) if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress)
{ {
CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress = true; CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress = true;
CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->Phase = 0; CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->Phase = 0;
CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->KillCount = 0; CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->KillCount = 0;
CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->PlayerGUID = player->GetGUID();
} }
return true; return true;
@@ -289,13 +289,13 @@ public:
{ {
if (Creature* pSummoned = me->SummonCreature(creatureId, PyrewoodSpawnPoints[position][0], PyrewoodSpawnPoints[position][1], PyrewoodSpawnPoints[position][2], PyrewoodSpawnPoints[position][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000)) if (Creature* pSummoned = me->SummonCreature(creatureId, PyrewoodSpawnPoints[position][0], PyrewoodSpawnPoints[position][1], PyrewoodSpawnPoints[position][2], PyrewoodSpawnPoints[position][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000))
{ {
Player* pPlayer = NULL; Player* player = NULL;
Unit* pTarget = NULL; Unit* pTarget = NULL;
if (PlayerGUID) if (PlayerGUID)
{ {
pPlayer = Unit::GetPlayer(*me, PlayerGUID); player = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer) if (player)
pTarget = RAND((Unit*)me, (Unit*)pPlayer); pTarget = RAND((Unit*)me, (Unit*)player);
} else } else
pTarget = me; pTarget = me;
@@ -311,9 +311,9 @@ public:
void JustDied(Unit* /*pKiller*/) void JustDied(Unit* /*pKiller*/)
{ {
if (PlayerGUID) if (PlayerGUID)
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
if (pPlayer->GetQuestStatus(QUEST_PYREWOOD_AMBUSH) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_PYREWOOD_AMBUSH) == QUEST_STATUS_INCOMPLETE)
pPlayer->FailQuest(QUEST_PYREWOOD_AMBUSH); player->FailQuest(QUEST_PYREWOOD_AMBUSH);
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
@@ -364,10 +364,10 @@ public:
case 5: //end case 5: //end
if (PlayerGUID) if (PlayerGUID)
{ {
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
{ {
me->MonsterSay(NPCSAY_END, LANG_UNIVERSAL, 0); //not blizzlike me->MonsterSay(NPCSAY_END, LANG_UNIVERSAL, 0); //not blizzlike
pPlayer->GroupEventHappens(QUEST_PYREWOOD_AMBUSH, me); player->GroupEventHappens(QUEST_PYREWOOD_AMBUSH, me);
} }
} }
QuestInProgress = false; QuestInProgress = false;
src/server/scripts/EasternKingdoms/stormwind_city.cpp
+34 -34
View File
@@ -48,27 +48,27 @@ class npc_archmage_malin : public CreatureScript
public: public:
npc_archmage_malin() : CreatureScript("npc_archmage_malin") { } npc_archmage_malin() : CreatureScript("npc_archmage_malin") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 42711, true); creature->CastSpell(player, 42711, true);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(11223) == QUEST_STATUS_COMPLETE) if (player->GetQuestStatus(11223) == QUEST_STATUS_COMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MALIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MALIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -90,12 +90,12 @@ class npc_bartleby : public CreatureScript
public: public:
npc_bartleby() : CreatureScript("npc_bartleby") { } npc_bartleby() : CreatureScript("npc_bartleby") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_BEAT) if (pQuest->GetQuestId() == QUEST_BEAT)
{ {
creature->setFaction(FACTION_ENEMY); creature->setFaction(FACTION_ENEMY);
creature->AI()->AttackStart(pPlayer); creature->AI()->AttackStart(player);
} }
return true; return true;
} }
@@ -162,12 +162,12 @@ class npc_dashel_stonefist : public CreatureScript
public: public:
npc_dashel_stonefist() : CreatureScript("npc_dashel_stonefist") { } npc_dashel_stonefist() : CreatureScript("npc_dashel_stonefist") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT8) if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT8)
{ {
creature->setFaction(FACTION_HOSTILE); creature->setFaction(FACTION_HOSTILE);
CAST_AI(npc_dashel_stonefist::npc_dashel_stonefistAI, creature->AI())->AttackStart(pPlayer); CAST_AI(npc_dashel_stonefist::npc_dashel_stonefistAI, creature->AI())->AttackStart(player);
} }
return true; return true;
} }
@@ -233,40 +233,40 @@ class npc_lady_katrana_prestor : public CreatureScript
public: public:
npc_lady_katrana_prestor() : CreatureScript("npc_lady_katrana_prestor") { } npc_lady_katrana_prestor() : CreatureScript("npc_lady_katrana_prestor") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(2694, creature->GetGUID()); player->SEND_GOSSIP_MENU(2694, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(2695, creature->GetGUID()); player->SEND_GOSSIP_MENU(2695, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(2696, creature->GetGUID()); player->SEND_GOSSIP_MENU(2696, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(4185); player->AreaExploredOrEventHappens(4185);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(2693, creature->GetGUID()); player->SEND_GOSSIP_MENU(2693, creature->GetGUID());
return true; return true;
} }
@@ -418,8 +418,8 @@ public:
break; break;
case 6: case 6:
DoScriptText(SAY_LESCOVAR_4, me); DoScriptText(SAY_LESCOVAR_4, me);
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
pPlayer->AreaExploredOrEventHappens(QUEST_THE_ATTACK); player->AreaExploredOrEventHappens(QUEST_THE_ATTACK);
uiTimer = 2000; uiTimer = 2000;
uiPhase = 7; uiPhase = 7;
break; break;
@@ -658,9 +658,9 @@ public:
case 10: case 10:
if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR, 10.0f)) if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR, 10.0f))
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
{ {
CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->Start(false, false, player->GetGUID());
CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->SetMaxPlayerDistance(200.0f); CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->SetMaxPlayerDistance(200.0f);
} }
} }
@@ -696,13 +696,13 @@ class npc_tyrion : public CreatureScript
public: public:
npc_tyrion() : CreatureScript("npc_tyrion") { } npc_tyrion() : CreatureScript("npc_tyrion") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *pQuest) bool OnQuestAccept(Player* player, Creature* creature, Quest const *pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_THE_ATTACK) if (pQuest->GetQuestId() == QUEST_THE_ATTACK)
{ {
if (Creature* pSpybot = creature->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true)) if (Creature* pSpybot = creature->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true))
{ {
CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->Start(false, false, player->GetGUID());
CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->SetMaxPlayerDistance(200.0f); CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->SetMaxPlayerDistance(200.0f);
} }
return true; return true;
src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
+7 -7
View File
@@ -44,11 +44,11 @@ public:
npc_galen_goodward() : CreatureScript("npc_galen_goodward") { } npc_galen_goodward() : CreatureScript("npc_galen_goodward") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const *quest)
{ {
if (quest->GetQuestId() == QUEST_GALENS_ESCAPE) if (quest->GetQuestId() == QUEST_GALENS_ESCAPE)
{ {
CAST_AI(npc_galen_goodward::npc_galen_goodwardAI, creature->AI())->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_galen_goodward::npc_galen_goodwardAI, creature->AI())->Start(false, false, player->GetGUID());
creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE); creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
DoScriptText(SAY_QUEST_ACCEPTED, creature); DoScriptText(SAY_QUEST_ACCEPTED, creature);
} }
@@ -115,12 +115,12 @@ public:
pCage->ResetDoorOrButton(); pCage->ResetDoorOrButton();
break; break;
case 20: case 20:
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
{ {
me->SetFacingToObject(pPlayer); me->SetFacingToObject(player);
DoScriptText(SAY_QUEST_COMPLETE, me, pPlayer); DoScriptText(SAY_QUEST_COMPLETE, me, player);
DoScriptText(EMOTE_WHISPER, me, pPlayer); DoScriptText(EMOTE_WHISPER, me, player);
pPlayer->GroupEventHappens(QUEST_GALENS_ESCAPE, me); player->GroupEventHappens(QUEST_GALENS_ESCAPE, me);
} }
SetRun(true); SetRun(true);
break; break;
src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
+11 -11
View File
@@ -48,13 +48,13 @@ class npc_calvin_montague : public CreatureScript
public: public:
npc_calvin_montague() : CreatureScript("npc_calvin_montague") { } npc_calvin_montague() : CreatureScript("npc_calvin_montague") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_590) if (pQuest->GetQuestId() == QUEST_590)
{ {
creature->setFaction(FACTION_HOSTILE); creature->setFaction(FACTION_HOSTILE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
CAST_AI(npc_calvin_montague::npc_calvin_montagueAI, creature->AI())->AttackStart(pPlayer); CAST_AI(npc_calvin_montague::npc_calvin_montagueAI, creature->AI())->AttackStart(player);
} }
return true; return true;
} }
@@ -130,8 +130,8 @@ public:
++m_uiPhase; ++m_uiPhase;
break; break;
case 2: case 2:
if (Player* pPlayer = Unit::GetPlayer(*me, m_uiPlayerGUID)) if (Player* player = Unit::GetPlayer(*me, m_uiPlayerGUID))
pPlayer->AreaExploredOrEventHappens(QUEST_590); player->AreaExploredOrEventHappens(QUEST_590);
DoCast(me, SPELL_DRINK, true); DoCast(me, SPELL_DRINK, true);
++m_uiPhase; ++m_uiPhase;
@@ -171,15 +171,15 @@ class go_mausoleum_door : public GameObjectScript
public: public:
go_mausoleum_door() : GameObjectScript("go_mausoleum_door") { } go_mausoleum_door() : GameObjectScript("go_mausoleum_door") { }
bool OnGossipHello(Player* pPlayer, GameObject* /*pGo*/) bool OnGossipHello(Player* player, GameObject* /*pGo*/)
{ {
if (pPlayer->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE)
return false; return false;
if (GameObject* pTrigger = pPlayer->FindNearestGameObject(GO_TRIGGER, 30.0f)) if (GameObject* pTrigger = player->FindNearestGameObject(GO_TRIGGER, 30.0f))
{ {
pTrigger->SetGoState(GO_STATE_READY); pTrigger->SetGoState(GO_STATE_READY);
pPlayer->SummonCreature(NPC_ULAG, 2390.26f, 336.47f, 40.01f, 2.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000); player->SummonCreature(NPC_ULAG, 2390.26f, 336.47f, 40.01f, 2.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000);
return false; return false;
} }
@@ -193,12 +193,12 @@ class go_mausoleum_trigger : public GameObjectScript
public: public:
go_mausoleum_trigger() : GameObjectScript("go_mausoleum_trigger") { } go_mausoleum_trigger() : GameObjectScript("go_mausoleum_trigger") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo) bool OnGossipHello(Player* player, GameObject* pGo)
{ {
if (pPlayer->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE)
return false; return false;
if (GameObject* pDoor = pPlayer->FindNearestGameObject(GO_DOOR, 30.0f)) if (GameObject* pDoor = player->FindNearestGameObject(GO_DOOR, 30.0f))
{ {
pGo->SetGoState(GO_STATE_ACTIVE); pGo->SetGoState(GO_STATE_ACTIVE);
pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND);
src/server/scripts/EasternKingdoms/undercity.cpp
+15 -15
View File
@@ -66,7 +66,7 @@ class npc_lady_sylvanas_windrunner : public CreatureScript
public: public:
npc_lady_sylvanas_windrunner() : CreatureScript("npc_lady_sylvanas_windrunner") { } npc_lady_sylvanas_windrunner() : CreatureScript("npc_lady_sylvanas_windrunner") { }
bool OnQuestReward(Player* /*pPlayer*/, Creature* creature, const Quest *_Quest, uint32 /*slot*/) bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest *_Quest, uint32 /*slot*/)
{ {
if (_Quest->GetQuestId() == QUEST_JOURNEY_TO_UNDERCITY) if (_Quest->GetQuestId() == QUEST_JOURNEY_TO_UNDERCITY)
{ {
@@ -219,36 +219,36 @@ class npc_parqual_fintallas : public CreatureScript
public: public:
npc_parqual_fintallas() : CreatureScript("npc_parqual_fintallas") { } npc_parqual_fintallas() : CreatureScript("npc_parqual_fintallas") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, SPELL_MARK_OF_SHAME, false); creature->CastSpell(player, SPELL_MARK_OF_SHAME, false);
} }
if (uiAction == GOSSIP_ACTION_INFO_DEF+2) if (uiAction == GOSSIP_ACTION_INFO_DEF+2)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(6628); player->AreaExploredOrEventHappens(6628);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(6628) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasAura(SPELL_MARK_OF_SHAME)) if (player->GetQuestStatus(6628) == QUEST_STATUS_INCOMPLETE && !player->HasAura(SPELL_MARK_OF_SHAME))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(5822, creature->GetGUID()); player->SEND_GOSSIP_MENU(5822, creature->GetGUID());
} }
else else
pPlayer->SEND_GOSSIP_MENU(5821, creature->GetGUID()); player->SEND_GOSSIP_MENU(5821, creature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+42 -42
View File
@@ -49,54 +49,54 @@ class npcs_dithers_and_arbington : public CreatureScript
public: public:
npcs_dithers_and_arbington() : CreatureScript("npcs_dithers_and_arbington") { } npcs_dithers_and_arbington() : CreatureScript("npcs_dithers_and_arbington") { }
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) switch(uiAction)
{ {
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->GetSession()->SendListInventory(creature->GetGUID()); player->GetSession()->SendListInventory(creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(3980, creature->GetGUID()); player->SEND_GOSSIP_MENU(3980, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(3981, creature->GetGUID()); player->SEND_GOSSIP_MENU(3981, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(3982, creature->GetGUID()); player->SEND_GOSSIP_MENU(3982, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(3983, creature->GetGUID()); player->SEND_GOSSIP_MENU(3983, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 17529, false); creature->CastSpell(player, 17529, false);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor()) if (creature->isVendor())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (pPlayer->GetQuestRewardStatus(5237) || pPlayer->GetQuestRewardStatus(5238)) if (player->GetQuestRewardStatus(5237) || player->GetQuestRewardStatus(5238))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(3985, creature->GetGUID()); player->SEND_GOSSIP_MENU(3985, creature->GetGUID());
}else }else
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -121,31 +121,31 @@ class npc_myranda_the_hag : public CreatureScript
public: public:
npc_myranda_the_hag() : CreatureScript("npc_myranda_the_hag") { } npc_myranda_the_hag() : CreatureScript("npc_myranda_the_hag") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->CastSpell(pPlayer, SPELL_SCARLET_ILLUSION, false); player->CastSpell(player, SPELL_SCARLET_ILLUSION, false);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_SUBTERFUGE) == QUEST_STATUS_COMPLETE && if (player->GetQuestStatus(QUEST_SUBTERFUGE) == QUEST_STATUS_COMPLETE &&
!pPlayer->GetQuestRewardStatus(QUEST_IN_DREAMS) && !pPlayer->HasAura(SPELL_SCARLET_ILLUSION)) !player->GetQuestRewardStatus(QUEST_IN_DREAMS) && !player->HasAura(SPELL_SCARLET_ILLUSION))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ILLUSION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ILLUSION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(4773, creature->GetGUID()); player->SEND_GOSSIP_MENU(4773, creature->GetGUID());
return true; return true;
} }
else else
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -293,12 +293,12 @@ class npc_anchorite_truuen : public CreatureScript
public: public:
npc_anchorite_truuen() : CreatureScript("npc_anchorite_truuen") { } npc_anchorite_truuen() : CreatureScript("npc_anchorite_truuen") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const *quest)
{ {
npc_escortAI* pEscortAI = CAST_AI(npc_anchorite_truuen::npc_anchorite_truuenAI, creature->AI()); npc_escortAI* pEscortAI = CAST_AI(npc_anchorite_truuen::npc_anchorite_truuenAI, creature->AI());
if (quest->GetQuestId() == QUEST_TOMB_LIGHTBRINGER) if (quest->GetQuestId() == QUEST_TOMB_LIGHTBRINGER)
pEscortAI->Start(true, true, pPlayer->GetGUID()); pEscortAI->Start(true, true, player->GetGUID());
return false; return false;
} }
@@ -332,7 +332,7 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
switch (i) switch (i)
{ {
case 8: case 8:
@@ -372,8 +372,8 @@ public:
m_uiChatTimer = 4000; m_uiChatTimer = 4000;
break; break;
case 26: case 26:
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_TOMB_LIGHTBRINGER, me); player->GroupEventHappens(QUEST_TOMB_LIGHTBRINGER, me);
break; break;
} }
} }
@@ -382,9 +382,9 @@ public:
void JustDied(Unit* /*pKiller*/) void JustDied(Unit* /*pKiller*/)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (pPlayer) if (player)
pPlayer->FailQuest(QUEST_TOMB_LIGHTBRINGER); player->FailQuest(QUEST_TOMB_LIGHTBRINGER);
} }
void UpdateAI(const uint32 uiDiff) void UpdateAI(const uint32 uiDiff)
src/server/scripts/EasternKingdoms/westfall.cpp
+14 -14
View File
@@ -54,14 +54,14 @@ class npc_daphne_stilwell : public CreatureScript
public: public:
npc_daphne_stilwell() : CreatureScript("npc_daphne_stilwell") { } npc_daphne_stilwell() : CreatureScript("npc_daphne_stilwell") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_TOME_VALOR) if (pQuest->GetQuestId() == QUEST_TOME_VALOR)
{ {
DoScriptText(SAY_DS_START, creature); DoScriptText(SAY_DS_START, creature);
if (npc_escortAI* pEscortAI = CAST_AI(npc_daphne_stilwell::npc_daphne_stilwellAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_daphne_stilwell::npc_daphne_stilwellAI, creature->AI()))
pEscortAI->Start(true, true, pPlayer->GetGUID()); pEscortAI->Start(true, true, player->GetGUID());
} }
return true; return true;
@@ -98,9 +98,9 @@ public:
void WaypointReached(uint32 uiPoint) void WaypointReached(uint32 uiPoint)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
uiWPHolder = uiPoint; uiWPHolder = uiPoint;
@@ -144,7 +144,7 @@ public:
me->HandleEmoteCommand(EMOTE_STATE_USESTANDING_NOSHEATHE); me->HandleEmoteCommand(EMOTE_STATE_USESTANDING_NOSHEATHE);
break; break;
case 17: case 17:
pPlayer->GroupEventHappens(QUEST_TOME_VALOR, me); player->GroupEventHappens(QUEST_TOME_VALOR, me);
break; break;
} }
} }
@@ -205,14 +205,14 @@ class npc_defias_traitor : public CreatureScript
public: public:
npc_defias_traitor() : CreatureScript("npc_defias_traitor") { } npc_defias_traitor() : CreatureScript("npc_defias_traitor") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_DEFIAS_BROTHERHOOD) if (quest->GetQuestId() == QUEST_DEFIAS_BROTHERHOOD)
{ {
if (npc_escortAI* pEscortAI = CAST_AI(npc_defias_traitor::npc_defias_traitorAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_defias_traitor::npc_defias_traitorAI, creature->AI()))
pEscortAI->Start(true, true, pPlayer->GetGUID()); pEscortAI->Start(true, true, player->GetGUID());
DoScriptText(SAY_START, creature, pPlayer); DoScriptText(SAY_START, creature, player);
} }
return true; return true;
@@ -229,9 +229,9 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch (i) switch (i)
@@ -240,13 +240,13 @@ public:
SetRun(false); SetRun(false);
break; break;
case 36: case 36:
DoScriptText(SAY_PROGRESS, me, pPlayer); DoScriptText(SAY_PROGRESS, me, player);
break; break;
case 44: case 44:
DoScriptText(SAY_END, me, pPlayer); DoScriptText(SAY_END, me, player);
{ {
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD, me); player->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD, me);
} }
break; break;
} }
src/server/scripts/EasternKingdoms/wetlands.cpp
+9 -9
View File
@@ -83,9 +83,9 @@ public:
void EnterCombat(Unit* /*pWho*/) void EnterCombat(Unit* /*pWho*/)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (HasEscortState(STATE_ESCORT_ESCORTING) && !m_bFriendSummoned && pPlayer) if (HasEscortState(STATE_ESCORT_ESCORTING) && !m_bFriendSummoned && player)
{ {
for (uint8 i = 0; i < 3; ++i) for (uint8 i = 0; i < 3; ++i)
DoCast(me, SPELL_CALL_FRIENDS, true); DoCast(me, SPELL_CALL_FRIENDS, true);
@@ -96,8 +96,8 @@ public:
void JustSummoned(Creature* pSummoned) void JustSummoned(Creature* pSummoned)
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
pSummoned->AI()->AttackStart(pPlayer); pSummoned->AI()->AttackStart(player);
} }
void AttackedBy(Unit* pAttacker) void AttackedBy(Unit* pAttacker)
@@ -115,10 +115,10 @@ public:
{ {
if (HealthBelowPct(20)) if (HealthBelowPct(20))
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
{ {
if (pPlayer->GetTypeId() == TYPEID_PLAYER) if (player->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(pPlayer)->GroupEventHappens(QUEST_MISSING_DIPLO_PT11, me); CAST_PLR(player)->GroupEventHappens(QUEST_MISSING_DIPLO_PT11, me);
uiDamage = 0; uiDamage = 0;
@@ -144,7 +144,7 @@ class npc_mikhail : public CreatureScript
public: public:
npc_mikhail() : CreatureScript("npc_mikhail") { } npc_mikhail() : CreatureScript("npc_mikhail") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT11) if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT11)
{ {
@@ -157,7 +157,7 @@ public:
pSlim->CastSpell(pSlim, SPELL_STEALTH, true); pSlim->CastSpell(pSlim, SPELL_STEALTH, true);
if (npc_tapoke_slim_jahn::npc_tapoke_slim_jahnAI* pEscortAI = CAST_AI(npc_tapoke_slim_jahn::npc_tapoke_slim_jahnAI, pSlim->AI())) if (npc_tapoke_slim_jahn::npc_tapoke_slim_jahnAI* pEscortAI = CAST_AI(npc_tapoke_slim_jahn::npc_tapoke_slim_jahnAI, pSlim->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); pEscortAI->Start(false, false, player->GetGUID(), pQuest);
} }
return false; return false;
} }
src/server/scripts/Examples/example_creature.cpp
+8 -8
View File
@@ -144,7 +144,7 @@ class example_creature : public CreatureScript
// *** HANDLED FUNCTION *** // *** HANDLED FUNCTION ***
//Our Receive emote function //Our Receive emote function
void ReceiveEmote(Player* /*pPlayer*/, uint32 uiTextEmote) void ReceiveEmote(Player* /*player*/, uint32 uiTextEmote)
{ {
me->HandleEmoteCommand(uiTextEmote); me->HandleEmoteCommand(uiTextEmote);
@@ -263,23 +263,23 @@ class example_creature : public CreatureScript
return new example_creatureAI(creature); return new example_creatureAI(creature);
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID()); player->SEND_GOSSIP_MENU(907, creature->GetGUID());
return true; 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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
//Set our faction to hostile towards all //Set our faction to hostile towards all
creature->setFaction(FACTION_WORGEN); creature->setFaction(FACTION_WORGEN);
creature->AI()->AttackStart(pPlayer); creature->AI()->AttackStart(player);
} }
return true; return true;
src/server/scripts/Examples/example_escort.cpp
+23 -23
View File
@@ -87,12 +87,12 @@ class example_escort : public CreatureScript
me->SummonCreature(NPC_FELBOAR, me->GetPositionX()+5.0f, me->GetPositionY()+7.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 3000); me->SummonCreature(NPC_FELBOAR, me->GetPositionX()+5.0f, me->GetPositionY()+7.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 3000);
break; break;
case 4: case 4:
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
{ {
//pTmpPlayer is the target of the text //pTmpPlayer is the target of the text
DoScriptText(SAY_WP_3, me, pPlayer); DoScriptText(SAY_WP_3, me, player);
//pTmpPlayer is the source of the text //pTmpPlayer is the source of the text
DoScriptText(SAY_WP_4, pPlayer); DoScriptText(SAY_WP_4, player);
} }
break; break;
} }
@@ -102,8 +102,8 @@ class example_escort : public CreatureScript
{ {
if (HasEscortState(STATE_ESCORT_ESCORTING)) if (HasEscortState(STATE_ESCORT_ESCORTING))
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
DoScriptText(SAY_AGGRO1, me, pPlayer); DoScriptText(SAY_AGGRO1, me, player);
} }
else else
DoScriptText(SAY_AGGRO2, me); DoScriptText(SAY_AGGRO2, me);
@@ -119,15 +119,15 @@ class example_escort : public CreatureScript
{ {
if (HasEscortState(STATE_ESCORT_ESCORTING)) if (HasEscortState(STATE_ESCORT_ESCORTING))
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
{ {
// not a likely case, code here for the sake of example // not a likely case, code here for the sake of example
if (pKiller == me) if (pKiller == me)
{ {
DoScriptText(SAY_DEATH_1, me, pPlayer); DoScriptText(SAY_DEATH_1, me, player);
} }
else else
DoScriptText(SAY_DEATH_2, me, pPlayer); DoScriptText(SAY_DEATH_2, me, player);
} }
} }
else else
@@ -183,44 +183,44 @@ class example_escort : public CreatureScript
return new example_escortAI(creature); return new example_escortAI(creature);
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
pPlayer->PrepareGossipMenu(creature, 0); player->PrepareGossipMenu(creature, 0);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SendPreparedGossip(creature); player->SendPreparedGossip(creature);
return true; 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();
npc_escortAI* pEscortAI = CAST_AI(example_escort::example_escortAI, creature->AI()); npc_escortAI* pEscortAI = CAST_AI(example_escort::example_escortAI, creature->AI());
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pEscortAI) if (pEscortAI)
pEscortAI->Start(true, true, pPlayer->GetGUID()); pEscortAI->Start(true, true, player->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pEscortAI) if (pEscortAI)
pEscortAI->Start(false, false, pPlayer->GetGUID()); pEscortAI->Start(false, false, player->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pEscortAI) if (pEscortAI)
pEscortAI->Start(false, true, pPlayer->GetGUID()); pEscortAI->Start(false, true, player->GetGUID());
break; break;
default: default:
return false; // nothing defined -> trinity core handling return false; // nothing defined -> trinity core handling
src/server/scripts/Examples/example_gossip_codebox.cpp
+13 -13
View File
@@ -48,47 +48,47 @@ class example_gossip_codebox : public CreatureScript
{ {
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->PlayerTalkClass->SendGossipMenu(907, creature->GetGUID()); player->PlayerTalkClass->SendGossipMenu(907, creature->GetGUID());
return true; 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+2) if (uiAction == GOSSIP_ACTION_INFO_DEF+2)
{ {
DoScriptText(SAY_NOT_INTERESTED, creature); DoScriptText(SAY_NOT_INTERESTED, creature);
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
} }
return true; return true;
} }
bool OnGossipSelectCode(Player* pPlayer, Creature* creature, uint32 uiSender, uint32 uiAction, const char* code) bool OnGossipSelectCode(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction, const char* code)
{ {
pPlayer->PlayerTalkClass->ClearMenus(); player->PlayerTalkClass->ClearMenus();
if (uiSender == GOSSIP_SENDER_MAIN) if (uiSender == GOSSIP_SENDER_MAIN)
{ {
switch (uiAction) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
if (std::strcmp(code, pPlayer->GetName()) != 0) if (std::strcmp(code, player->GetName()) != 0)
{ {
DoScriptText(SAY_WRONG, creature); DoScriptText(SAY_WRONG, creature);
creature->CastSpell(pPlayer, SPELL_POLYMORPH, true); creature->CastSpell(player, SPELL_POLYMORPH, true);
} }
else else
{ {
DoScriptText(SAY_CORRECT, creature); DoScriptText(SAY_CORRECT, creature);
creature->CastSpell(pPlayer, SPELL_MARK_OF_THE_WILD, true); creature->CastSpell(player, SPELL_MARK_OF_THE_WILD, true);
} }
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
return true; return true;
} }
src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+17 -17
View File
@@ -37,10 +37,10 @@ class go_blackfathom_altar : public GameObjectScript
public: public:
go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { } go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { }
bool OnGossipHello(Player* pPlayer, GameObject* /*pGo*/) bool OnGossipHello(Player* player, GameObject* /*pGo*/)
{ {
if (!pPlayer->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM))
pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, pPlayer); player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player);
return true; return true;
} }
@@ -51,7 +51,7 @@ class go_blackfathom_fire : public GameObjectScript
public: public:
go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { } go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{ {
InstanceScript *pInstance = pGo->GetInstanceScript(); InstanceScript *pInstance = pGo->GetInstanceScript();
@@ -116,16 +116,16 @@ public:
for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
{ {
if (Player* pPlayer = i->getSource()) if (Player* player = i->getSource())
{ {
if (pPlayer->isGameMaster()) if (player->isGameMaster())
continue; continue;
if (pPlayer->isAlive()) if (player->isAlive())
{ {
me->SetInCombatWith(pPlayer); me->SetInCombatWith(player);
pPlayer->SetInCombatWith(me); player->SetInCombatWith(me);
me->AddThreat(pPlayer, 0.0f); me->AddThreat(player, 0.0f);
} }
} }
} }
@@ -201,24 +201,24 @@ class npc_morridune : public CreatureScript
public: public:
npc_morridune() : CreatureScript("npc_morridune") { } npc_morridune() : CreatureScript("npc_morridune") { }
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) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f);
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MORRIDUNE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MORRIDUNE, 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; return true;
} }
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+33 -33
View File
@@ -50,19 +50,19 @@ class npc_jaina_proudmoore : public CreatureScript
public: public:
npc_jaina_proudmoore() : CreatureScript("npc_jaina_proudmoore") { } npc_jaina_proudmoore() : CreatureScript("npc_jaina_proudmoore") { }
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();
hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
ai->StartEvent(pPlayer); ai->StartEvent(player);
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
ai->FirstBossDead = true; ai->FirstBossDead = true;
ai->WaveCount = 9; ai->WaveCount = 9;
ai->StartEvent(pPlayer); ai->StartEvent(player);
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
ai->Retreat(); ai->Retreat();
@@ -75,7 +75,7 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
if (ai->EventBegun) if (ai->EventBegun)
@@ -84,16 +84,16 @@ public:
uint32 RageEncounter = ai->GetInstanceData(DATA_RAGEWINTERCHILLEVENT); uint32 RageEncounter = ai->GetInstanceData(DATA_RAGEWINTERCHILLEVENT);
uint32 AnetheronEncounter = ai->GetInstanceData(DATA_ANETHERONEVENT); uint32 AnetheronEncounter = ai->GetInstanceData(DATA_ANETHERONEVENT);
if (RageEncounter == NOT_STARTED) if (RageEncounter == NOT_STARTED)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
else if (RageEncounter == DONE && AnetheronEncounter == NOT_STARTED) else if (RageEncounter == DONE && AnetheronEncounter == NOT_STARTED)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
else if (RageEncounter == DONE && AnetheronEncounter == DONE) else if (RageEncounter == DONE && AnetheronEncounter == DONE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
if (pPlayer->isGameMaster()) if (player->isGameMaster())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID()); player->SEND_GOSSIP_MENU(907, creature->GetGUID());
return true; return true;
} }
@@ -126,20 +126,20 @@ class npc_thrall : public CreatureScript
public: public:
npc_thrall() : CreatureScript("npc_thrall") { } npc_thrall() : CreatureScript("npc_thrall") { }
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();
hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
ai->DeSpawnVeins();//despawn the alliance veins ai->DeSpawnVeins();//despawn the alliance veins
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
ai->StartEvent(pPlayer); ai->StartEvent(player);
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
ai->FirstBossDead = true; ai->FirstBossDead = true;
ai->WaveCount = 9; ai->WaveCount = 9;
ai->StartEvent(pPlayer); ai->StartEvent(player);
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
ai->Retreat(); ai->Retreat();
@@ -152,7 +152,7 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
if (ai->EventBegun) if (ai->EventBegun)
@@ -165,17 +165,17 @@ public:
uint32 KazrogalEvent = ai->GetInstanceData(DATA_KAZROGALEVENT); uint32 KazrogalEvent = ai->GetInstanceData(DATA_KAZROGALEVENT);
uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT);
if (KazrogalEvent == NOT_STARTED) if (KazrogalEvent == NOT_STARTED)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
else if (KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED) else if (KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
else if (AzgalorEvent == DONE) else if (AzgalorEvent == DONE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
} }
if (pPlayer->isGameMaster()) if (player->isGameMaster())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID()); player->SEND_GOSSIP_MENU(907, creature->GetGUID());
return true; return true;
} }
@@ -212,34 +212,34 @@ public:
return ai; return ai;
} }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1); uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true); Item* item = player->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true);
if (item && pPlayer) if (item && player)
pPlayer->SendNewItem(item, 1, true, false, true); player->SendNewItem(item, 1, true, false, true);
} }
pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID()); player->SEND_GOSSIP_MENU(907, creature->GetGUID());
CAST_AI(hyjalAI, creature->AI()); CAST_AI(hyjalAI, creature->AI());
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT);
// Only let them get item if Azgalor is dead. // Only let them get item if Azgalor is dead.
if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS, 1)) if (AzgalorEvent == DONE && !player->HasItemCount(ITEM_TEAR_OF_GODDESS, 1))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID()); player->SEND_GOSSIP_MENU(907, creature->GetGUID());
return true; return true;
} }
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+3 -3
View File
@@ -580,9 +580,9 @@ void hyjalAI::SummonNextWave(const Wave wave[18], uint32 Count, float Base[4][3]
CheckTimer = 5000; CheckTimer = 5000;
} }
void hyjalAI::StartEvent(Player* pPlayer) void hyjalAI::StartEvent(Player* player)
{ {
if (!pPlayer || IsDummy || !pInstance) if (!player || IsDummy || !pInstance)
return; return;
Talk(BEGIN); Talk(BEGIN);
@@ -592,7 +592,7 @@ void hyjalAI::StartEvent(Player* pPlayer)
NextWaveTimer = 15000; NextWaveTimer = 15000;
CheckTimer = 5000; CheckTimer = 5000;
PlayerGUID = pPlayer->GetGUID(); PlayerGUID = player->GetGUID();
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+18 -18
View File
@@ -231,9 +231,9 @@ class npc_arthas : public CreatureScript
public: public:
npc_arthas() : CreatureScript("npc_arthas") { } npc_arthas() : CreatureScript("npc_arthas") { }
bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*sender*/, uint32 action) bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{ {
pPlayer->PlayerTalkClass->ClearMenus(); player->PlayerTalkClass->ClearMenus();
npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, creature->AI());
if (!pAI) if (!pAI)
@@ -242,7 +242,7 @@ public:
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pAI->Start(true, true, pPlayer->GetGUID(), 0, false, false); pAI->Start(true, true, player->GetGUID(), 0, false, false);
pAI->SetDespawnAtEnd(false); pAI->SetDespawnAtEnd(false);
pAI->bStepping = false; pAI->bStepping = false;
pAI->uiStep = 1; pAI->uiStep = 1;
@@ -268,13 +268,13 @@ public:
pAI->uiStep = 85; pAI->uiStep = 85;
break; break;
} }
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pAI->SetDespawnAtFar(true); pAI->SetDespawnAtFar(true);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, creature->AI());
@@ -284,32 +284,32 @@ public:
{ {
case 0: //This one is a workaround since the very beggining of the script is wrong. case 0: //This one is a workaround since the very beggining of the script is wrong.
{ {
QuestStatus status = pPlayer->GetQuestStatus(13149); QuestStatus status = player->GetQuestStatus(13149);
if (status != QUEST_STATUS_COMPLETE && status != QUEST_STATUS_REWARDED) if (status != QUEST_STATUS_COMPLETE && status != QUEST_STATUS_REWARDED)
return false; return false;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID()); player->SEND_GOSSIP_MENU(907, creature->GetGUID());
break; break;
} }
case 1: case 1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_1, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_1, creature->GetGUID());
break; break;
case 2: case 2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_2, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_2, creature->GetGUID());
break; break;
case 3: case 3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_3, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_3, creature->GetGUID());
break; break;
case 4: case 4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_4, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_4, creature->GetGUID());
break; break;
case 5: case 5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_5, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_5, creature->GetGUID());
break; break;
default: default:
return false; return false;
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+13 -13
View File
@@ -370,36 +370,36 @@ class npc_saat : public CreatureScript
public: public:
npc_saat() : CreatureScript("npc_saat") { } npc_saat() : CreatureScript("npc_saat") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, SPELL_CHRONO_BEACON, false); creature->CastSpell(player, SPELL_CHRONO_BEACON, false);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON, 1)) if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(ITEM_CHRONO_BEACON, 1))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(10000, creature->GetGUID()); player->SEND_GOSSIP_MENU(10000, creature->GetGUID());
return true; return true;
} }
else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON, 1)) else if (player->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !player->HasItemCount(ITEM_CHRONO_BEACON, 1))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(10001, creature->GetGUID()); player->SEND_GOSSIP_MENU(10001, creature->GetGUID());
return true; return true;
} }
pPlayer->SEND_GOSSIP_MENU(10002, creature->GetGUID()); player->SEND_GOSSIP_MENU(10002, creature->GetGUID());
return true; return true;
} }
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+7 -7
View File
@@ -124,12 +124,12 @@ public:
return false; return false;
} }
void OnPlayerEnter(Player* pPlayer) void OnPlayerEnter(Player* player)
{ {
if (GetData(TYPE_MEDIVH) == IN_PROGRESS) if (GetData(TYPE_MEDIVH) == IN_PROGRESS)
return; return;
pPlayer->SendUpdateWorldState(WORLD_STATE_BM, 0); player->SendUpdateWorldState(WORLD_STATE_BM, 0);
} }
void OnCreatureCreate(Creature* creature) void OnCreatureCreate(Creature* creature)
@@ -208,13 +208,13 @@ public:
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
if (Player* pPlayer = itr->getSource()) if (Player* player = itr->getSource())
{ {
if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL); player->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL);
if (pPlayer->GetQuestStatus(QUEST_MASTER_TOUCH) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_MASTER_TOUCH) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(QUEST_MASTER_TOUCH); player->AreaExploredOrEventHappens(QUEST_MASTER_TOUCH);
} }
} }
} }
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ class go_barrel_old_hillsbrad : public GameObjectScript
public: public:
go_barrel_old_hillsbrad() : GameObjectScript("go_barrel_old_hillsbrad") { } go_barrel_old_hillsbrad() : GameObjectScript("go_barrel_old_hillsbrad") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{ {
if (InstanceScript* pInstance = pGO->GetInstanceScript()) if (InstanceScript* pInstance = pGO->GetInstanceScript())
{ {
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+5 -5
View File
@@ -95,8 +95,8 @@ public:
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
if (Player* pPlayer = itr->getSource()) if (Player* player = itr->getSource())
pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0); player->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0);
} }
} }
} }
@@ -119,9 +119,9 @@ public:
void SetData(uint32 type, uint32 data) void SetData(uint32 type, uint32 data)
{ {
Player* pPlayer = GetPlayerInMap(); Player* player = GetPlayerInMap();
if (!pPlayer) if (!player)
{ {
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data); sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data);
return; return;
@@ -146,7 +146,7 @@ public:
if (mBarrelCount == 5) if (mBarrelCount == 5)
{ {
UpdateQuestCredit(); UpdateQuestCredit();
pPlayer->SummonCreature(DRAKE_ENTRY, 2128.43f, 71.01f, 64.42f, 1.74f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); player->SummonCreature(DRAKE_ENTRY, 2128.43f, 71.01f, 64.42f, 1.74f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000);
m_auiEncounter[0] = DONE; m_auiEncounter[0] = DONE;
} }
} }
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+42 -42
View File
@@ -51,39 +51,39 @@ class npc_erozion : public CreatureScript
public: public:
npc_erozion() : CreatureScript("npc_erozion") { } npc_erozion() : CreatureScript("npc_erozion") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1); uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
pPlayer->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true); player->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true);
} }
pPlayer->SEND_GOSSIP_MENU(9515, creature->GetGUID()); player->SEND_GOSSIP_MENU(9515, creature->GetGUID());
} }
if (uiAction == GOSSIP_ACTION_INFO_DEF+2) if (uiAction == GOSSIP_ACTION_INFO_DEF+2)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS, 1)) if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !player->HasItemCount(ITEM_ENTRY_BOMBS, 1))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) if (player->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(9778, creature->GetGUID()); player->SEND_GOSSIP_MENU(9778, creature->GetGUID());
return true; return true;
} }
@@ -198,14 +198,14 @@ public:
return new npc_thrall_old_hillsbradAI(creature); return new npc_thrall_old_hillsbradAI(creature);
} }
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();
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pInstance) if (pInstance)
{ {
pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS); pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS);
@@ -215,7 +215,7 @@ public:
DoScriptText(SAY_TH_START_EVENT_PART1, creature); DoScriptText(SAY_TH_START_EVENT_PART1, creature);
if (npc_escortAI* pEscortAI = CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI()))
pEscortAI->Start(true, true, pPlayer->GetGUID()); pEscortAI->Start(true, true, player->GetGUID());
CAST_AI(npc_escortAI, (creature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far CAST_AI(npc_escortAI, (creature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far
CAST_AI(npc_escortAI, (creature->AI()))->SetDespawnAtEnd(false); CAST_AI(npc_escortAI, (creature->AI()))->SetDespawnAtEnd(false);
@@ -223,12 +223,12 @@ public:
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+20: case GOSSIP_ACTION_INFO_DEF+20:
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, creature->GetGUID());
creature->SummonCreature(SKARLOC_MOUNT, 2038.81f, 270.26f, 63.20f, 5.41f, TEMPSUMMON_TIMED_DESPAWN, 12000); creature->SummonCreature(SKARLOC_MOUNT, 2038.81f, 270.26f, 63.20f, 5.41f, TEMPSUMMON_TIMED_DESPAWN, 12000);
if (pInstance) if (pInstance)
pInstance->SetData(TYPE_THRALL_PART2, IN_PROGRESS); pInstance->SetData(TYPE_THRALL_PART2, IN_PROGRESS);
@@ -239,7 +239,7 @@ public:
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pInstance) if (pInstance)
pInstance->SetData(TYPE_THRALL_PART3, IN_PROGRESS); pInstance->SetData(TYPE_THRALL_PART3, IN_PROGRESS);
CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())->StartWP(); CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())->StartWP();
@@ -248,12 +248,12 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
{ {
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
pPlayer->SendPreparedQuest(creature->GetGUID()); player->SendPreparedQuest(creature->GetGUID());
} }
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
@@ -261,20 +261,20 @@ public:
{ {
if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT)) if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WALKING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WALKING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_START, creature->GetGUID());
} }
if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2)) if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, creature->GetGUID());
} }
if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3)) if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, creature->GetGUID());
} }
} }
return true; return true;
@@ -439,8 +439,8 @@ public:
//trigger taretha to run down outside //trigger taretha to run down outside
if (Creature* Taretha = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TARETHA))) if (Creature* Taretha = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TARETHA)))
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
CAST_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, pPlayer->GetGUID()); CAST_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, player->GetGUID());
} }
//kill credit Creature for quest //kill credit Creature for quest
@@ -450,8 +450,8 @@ public:
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
if (Player* pPlayer = itr->getSource()) if (Player* player = itr->getSource())
pPlayer->KilledMonsterCredit(20156, 0); player->KilledMonsterCredit(20156, 0);
} }
} }
@@ -581,18 +581,18 @@ public:
return new npc_tarethaAI(creature); return new npc_tarethaAI(creature);
} }
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();
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if (uiAction == GOSSIP_ACTION_INFO_DEF+1) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, creature->GetGUID());
} }
if (uiAction == GOSSIP_ACTION_INFO_DEF+2) if (uiAction == GOSSIP_ACTION_INFO_DEF+2)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS)
{ {
@@ -611,13 +611,13 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, creature->GetGUID());
} }
return true; return true;
} }
src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+13 -13
View File
@@ -52,33 +52,33 @@ class npc_henry_stern : public CreatureScript
public: public:
npc_henry_stern() : CreatureScript("npc_henry_stern") { } npc_henry_stern() : CreatureScript("npc_henry_stern") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
pPlayer->CastSpell(pPlayer, SPELL_TEACHING_GOLDTHORN_TEA, true); player->CastSpell(player, SPELL_TEACHING_GOLDTHORN_TEA, true);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_TEA_ANSWER, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXT_TEA_ANSWER, creature->GetGUID());
} }
if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) if (uiAction == GOSSIP_ACTION_INFO_DEF + 2)
{ {
pPlayer->CastSpell(pPlayer, SPELL_TEACHING_MIGHTY_TROLLS_BLOOD_POTION, true); player->CastSpell(player, SPELL_TEACHING_MIGHTY_TROLLS_BLOOD_POTION, true);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_POTION_ANSWER, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXT_POTION_ANSWER, creature->GetGUID());
} }
return true; return true;
} }
bool OnGossipHello (Player* pPlayer, Creature* creature) bool OnGossipHello (Player* player, Creature* creature)
{ {
if (pPlayer->GetBaseSkillValue(SKILL_COOKING) >= 175 && !pPlayer->HasSpell(SPELL_GOLDTHORN_TEA)) if (player->GetBaseSkillValue(SKILL_COOKING) >= 175 && !player->HasSpell(SPELL_GOLDTHORN_TEA))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if (pPlayer->GetBaseSkillValue(SKILL_ALCHEMY) >= 180 && !pPlayer->HasSpell(SPELL_MIGHT_TROLLS_BLOOD_POTION)) if (player->GetBaseSkillValue(SKILL_ALCHEMY) >= 180 && !player->HasSpell(SPELL_MIGHT_TROLLS_BLOOD_POTION))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_POTION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_POTION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -93,7 +93,7 @@ class go_gong : public GameObjectScript
public: public:
go_gong() : GameObjectScript("go_gong") { } go_gong() : GameObjectScript("go_gong") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{ {
//basic support, not blizzlike data is missing... //basic support, not blizzlike data is missing...
InstanceScript* pInstance = pGO->GetInstanceScript(); InstanceScript* pInstance = pGO->GetInstanceScript();
src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+18 -18
View File
@@ -51,12 +51,12 @@ class npc_willix : public CreatureScript
public: public:
npc_willix() : CreatureScript("npc_willix") { } npc_willix() : CreatureScript("npc_willix") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER)
{ {
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
DoScriptText(SAY_READY, creature, pPlayer); DoScriptText(SAY_READY, creature, player);
creature->setFaction(113); creature->setFaction(113);
} }
@@ -74,52 +74,52 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch (i) switch (i)
{ {
case 3: case 3:
me->HandleEmoteCommand(EMOTE_STATE_POINT); me->HandleEmoteCommand(EMOTE_STATE_POINT);
DoScriptText(SAY_POINT, me, pPlayer); DoScriptText(SAY_POINT, me, player);
break; break;
case 4: case 4:
me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break; break;
case 8: case 8:
DoScriptText(SAY_BLUELEAF, me, pPlayer); DoScriptText(SAY_BLUELEAF, me, player);
break; break;
case 9: case 9:
DoScriptText(SAY_DANGER, me, pPlayer); DoScriptText(SAY_DANGER, me, player);
break; break;
case 13: case 13:
DoScriptText(SAY_BAD, me, pPlayer); DoScriptText(SAY_BAD, me, player);
break; break;
case 14: case 14:
me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break; break;
case 25: case 25:
DoScriptText(SAY_THINK, me, pPlayer); DoScriptText(SAY_THINK, me, player);
break; break;
case 31: case 31:
DoScriptText(SAY_SOON, me, pPlayer); DoScriptText(SAY_SOON, me, player);
break; break;
case 42: case 42:
DoScriptText(SAY_FINALY, me, pPlayer); DoScriptText(SAY_FINALY, me, player);
break; break;
case 43: case 43:
me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break; break;
case 45: case 45:
DoScriptText(SAY_WIN, me, pPlayer); DoScriptText(SAY_WIN, me, player);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) if (player && player->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me); CAST_PLR(player)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me);
break; break;
case 46: case 46:
DoScriptText(SAY_END, me, pPlayer); DoScriptText(SAY_END, me, player);
break; break;
} }
} }
@@ -138,8 +138,8 @@ public:
void JustDied(Unit* /*killer*/) void JustDied(Unit* /*killer*/)
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
CAST_PLR(pPlayer)->FailQuest(QUEST_WILLIX_THE_IMPORTER); CAST_PLR(player)->FailQuest(QUEST_WILLIX_THE_IMPORTER);
} }
}; };
src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+9 -9
View File
@@ -85,13 +85,13 @@ public:
return new npc_disciple_of_naralexAI(creature); return new npc_disciple_of_naralexAI(creature);
} }
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();
InstanceScript *pInstance = creature->GetInstanceScript(); InstanceScript *pInstance = creature->GetInstanceScript();
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pInstance) if (pInstance)
pInstance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS); pInstance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS);
@@ -100,25 +100,25 @@ public:
creature->setFaction(250); creature->setFaction(250);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID());
CAST_AI(npc_escortAI, (creature->AI()))->SetDespawnAtFar(false); CAST_AI(npc_escortAI, (creature->AI()))->SetDespawnAtFar(false);
CAST_AI(npc_escortAI, (creature->AI()))->SetDespawnAtEnd(false); CAST_AI(npc_escortAI, (creature->AI()))->SetDespawnAtEnd(false);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
InstanceScript *pInstance = creature->GetInstanceScript(); InstanceScript *pInstance = creature->GetInstanceScript();
if (pInstance) if (pInstance)
{ {
creature->CastSpell(pPlayer, SPELL_MARK_OF_THE_WILD_RANK_2, true); creature->CastSpell(player, SPELL_MARK_OF_THE_WILD_RANK_2, true);
if ((pInstance->GetData(TYPE_LORD_COBRAHN) == DONE) && (pInstance->GetData(TYPE_LORD_PYTHAS) == DONE) && if ((pInstance->GetData(TYPE_LORD_COBRAHN) == DONE) && (pInstance->GetData(TYPE_LORD_PYTHAS) == DONE) &&
(pInstance->GetData(TYPE_LADY_ANACONDRA) == DONE) && (pInstance->GetData(TYPE_LORD_SERPENTIS) == DONE)) (pInstance->GetData(TYPE_LADY_ANACONDRA) == DONE) && (pInstance->GetData(TYPE_LORD_SERPENTIS) == DONE))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NARALEX, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NARALEX, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, creature->GetGUID());
if (!pInstance->GetData(TYPE_NARALEX_YELLED)) if (!pInstance->GetData(TYPE_NARALEX_YELLED))
{ {
@@ -128,7 +128,7 @@ public:
} }
else else
{ {
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_1, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_ID_START_1, creature->GetGUID());
} }
} }
return true; return true;
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+21 -21
View File
@@ -61,32 +61,32 @@ class npc_sergeant_bly : public CreatureScript
public: public:
npc_sergeant_bly() : CreatureScript("npc_sergeant_bly") { } npc_sergeant_bly() : CreatureScript("npc_sergeant_bly") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI, creature->AI())->PlayerGUID = player->GetGUID();
creature->AI()->DoAction(0); creature->AI()->DoAction(0);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (InstanceScript* pInstance = creature->GetInstanceScript()) if (InstanceScript* pInstance = creature->GetInstanceScript())
{ {
if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_KILLED_ALL_TROLLS) if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_KILLED_ALL_TROLLS)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(1517, creature->GetGUID()); player->SEND_GOSSIP_MENU(1517, creature->GetGUID());
} }
else else
if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_NOT_STARTED) if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_NOT_STARTED)
pPlayer->SEND_GOSSIP_MENU(1515, creature->GetGUID()); player->SEND_GOSSIP_MENU(1515, creature->GetGUID());
else else
pPlayer->SEND_GOSSIP_MENU(1516, creature->GetGUID()); player->SEND_GOSSIP_MENU(1516, creature->GetGUID());
return true; return true;
} }
return false; return false;
@@ -216,7 +216,7 @@ class go_troll_cage : public GameObjectScript
public: public:
go_troll_cage() : GameObjectScript("go_troll_cage") { } go_troll_cage() : GameObjectScript("go_troll_cage") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{ {
if (InstanceScript* pInstance = pGo->GetInstanceScript()) if (InstanceScript* pInstance = pGo->GetInstanceScript())
{ {
@@ -258,33 +258,33 @@ class npc_weegli_blastfuse : public CreatureScript
public: public:
npc_weegli_blastfuse() : CreatureScript("npc_weegli_blastfuse") { } npc_weegli_blastfuse() : CreatureScript("npc_weegli_blastfuse") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
//here we make him run to door, set the charge and run away off to nowhere //here we make him run to door, set the charge and run away off to nowhere
creature->AI()->DoAction(0); creature->AI()->DoAction(0);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (InstanceScript* pInstance = creature->GetInstanceScript()) if (InstanceScript* pInstance = creature->GetInstanceScript())
{ {
switch (pInstance->GetData(EVENT_PYRAMID)) switch (pInstance->GetData(EVENT_PYRAMID))
{ {
case PYRAMID_KILLED_ALL_TROLLS: case PYRAMID_KILLED_ALL_TROLLS:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(1514, creature->GetGUID()); //if event can proceed to end player->SEND_GOSSIP_MENU(1514, creature->GetGUID()); //if event can proceed to end
break; break;
case PYRAMID_NOT_STARTED: case PYRAMID_NOT_STARTED:
pPlayer->SEND_GOSSIP_MENU(1511, creature->GetGUID()); //if event not started player->SEND_GOSSIP_MENU(1511, creature->GetGUID()); //if event not started
break; break;
default: default:
pPlayer->SEND_GOSSIP_MENU(1513, creature->GetGUID()); //if event are in progress player->SEND_GOSSIP_MENU(1513, creature->GetGUID()); //if event are in progress
} }
return true; return true;
} }
@@ -410,7 +410,7 @@ class go_shallow_grave : public GameObjectScript
public: public:
go_shallow_grave() : GameObjectScript("go_shallow_grave") { } go_shallow_grave() : GameObjectScript("go_shallow_grave") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{ {
// randomly summon a zombie or dead hero the first time a grave is used // randomly summon a zombie or dead hero the first time a grave is used
if (pGo->GetUseCount() == 0) if (pGo->GetUseCount() == 0)
@@ -443,9 +443,9 @@ class at_zumrah : public AreaTriggerScript
public: public:
at_zumrah() : AreaTriggerScript("at_zumrah") { } at_zumrah() : AreaTriggerScript("at_zumrah") { }
bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) bool OnTrigger(Player* player, const AreaTriggerEntry * /*at*/)
{ {
Creature* pZumrah = pPlayer->FindNearestCreature(ZUMRAH_ID, 30.0f); Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f);
if (!pZumrah) if (!pZumrah)
return false; return false;
src/server/scripts/Kalimdor/ashenvale.cpp
+24 -24
View File
@@ -70,18 +70,18 @@ class npc_torek : public CreatureScript
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch (i) switch (i)
{ {
case 1: case 1:
DoScriptText(SAY_MOVE, me, pPlayer); DoScriptText(SAY_MOVE, me, player);
break; break;
case 8: case 8:
DoScriptText(SAY_PREPARE, me, pPlayer); DoScriptText(SAY_PREPARE, me, player);
break; break;
case 19: case 19:
//TODO: verify location and creatures amount. //TODO: verify location and creatures amount.
@@ -90,13 +90,13 @@ class npc_torek : public CreatureScript
me->SummonCreature(ENTRY_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(ENTRY_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break; break;
case 20: case 20:
DoScriptText(SAY_WIN, me, pPlayer); DoScriptText(SAY_WIN, me, player);
Completed = true; Completed = true;
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_TOREK_ASSULT, me); player->GroupEventHappens(QUEST_TOREK_ASSULT, me);
break; break;
case 21: case 21:
DoScriptText(SAY_END, me, pPlayer); DoScriptText(SAY_END, me, player);
break; break;
} }
} }
@@ -181,9 +181,9 @@ class npc_ruul_snowhoof : public CreatureScript
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(i) switch(i)
@@ -206,8 +206,8 @@ class npc_ruul_snowhoof : public CreatureScript
break; break;
case 21:{ case 21:{
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_FREEDOM_TO_RUUL, me); player->GroupEventHappens(QUEST_FREEDOM_TO_RUUL, me);
break; } break; }
} }
@@ -317,17 +317,17 @@ class npc_muglash : public CreatureScript
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
switch(i) switch(i)
{ {
case 0: case 0:
if (pPlayer) if (player)
DoScriptText(SAY_MUG_START2, me, pPlayer); DoScriptText(SAY_MUG_START2, me, player);
break; break;
case 24: case 24:
if (pPlayer) if (player)
DoScriptText(SAY_MUG_BRAZIER, me, pPlayer); DoScriptText(SAY_MUG_BRAZIER, me, player);
if (GameObject* pGo = GetClosestGameObjectWithEntry(me, GO_NAGA_BRAZIER, INTERACTION_DISTANCE*2)) if (GameObject* pGo = GetClosestGameObjectWithEntry(me, GO_NAGA_BRAZIER, INTERACTION_DISTANCE*2))
{ {
@@ -338,8 +338,8 @@ class npc_muglash : public CreatureScript
case 25: case 25:
DoScriptText(SAY_MUG_GRATITUDE, me); DoScriptText(SAY_MUG_GRATITUDE, me);
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_VORSHA, me); player->GroupEventHappens(QUEST_VORSHA, me);
break; break;
case 26: case 26:
DoScriptText(SAY_MUG_PATROL, me); DoScriptText(SAY_MUG_PATROL, me);
@@ -352,11 +352,11 @@ class npc_muglash : public CreatureScript
void EnterCombat(Unit* /*pWho*/) void EnterCombat(Unit* /*pWho*/)
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
if (HasEscortState(STATE_ESCORT_PAUSED)) if (HasEscortState(STATE_ESCORT_PAUSED))
{ {
if (urand(0, 1)) if (urand(0, 1))
DoScriptText(SAY_MUG_ON_GUARD, me, pPlayer); DoScriptText(SAY_MUG_ON_GUARD, me, player);
return; return;
} }
} }
@@ -370,12 +370,12 @@ class npc_muglash : public CreatureScript
void JustDied(Unit* /*pKiller*/) void JustDied(Unit* /*pKiller*/)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (HasEscortState(STATE_ESCORT_ESCORTING)) if (HasEscortState(STATE_ESCORT_ESCORTING))
{ {
if (pPlayer) if (player)
{ {
pPlayer->FailQuest(QUEST_VORSHA); player->FailQuest(QUEST_VORSHA);
} }
} }
} }
src/server/scripts/Kalimdor/azshara.cpp
+44 -44
View File
@@ -120,56 +120,56 @@ class npc_loramus_thalipedes : public CreatureScript
public: public:
npc_loramus_thalipedes() : CreatureScript("npc_loramus_thalipedes") { } npc_loramus_thalipedes() : CreatureScript("npc_loramus_thalipedes") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(2744); player->AreaExploredOrEventHappens(2744);
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
pPlayer->SEND_GOSSIP_MENU(1813, creature->GetGUID()); player->SEND_GOSSIP_MENU(1813, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+21: case GOSSIP_ACTION_INFO_DEF+21:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
pPlayer->SEND_GOSSIP_MENU(1814, creature->GetGUID()); player->SEND_GOSSIP_MENU(1814, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+22: case GOSSIP_ACTION_INFO_DEF+22:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
pPlayer->SEND_GOSSIP_MENU(1815, creature->GetGUID()); player->SEND_GOSSIP_MENU(1815, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+23: case GOSSIP_ACTION_INFO_DEF+23:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
pPlayer->SEND_GOSSIP_MENU(1816, creature->GetGUID()); player->SEND_GOSSIP_MENU(1816, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+24: case GOSSIP_ACTION_INFO_DEF+24:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
pPlayer->SEND_GOSSIP_MENU(1817, creature->GetGUID()); player->SEND_GOSSIP_MENU(1817, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+25: case GOSSIP_ACTION_INFO_DEF+25:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(3141); player->AreaExploredOrEventHappens(3141);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (pPlayer->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -267,25 +267,25 @@ class mob_rizzle_sprysprocket : public CreatureScript
public: public:
mob_rizzle_sprysprocket() : CreatureScript("mob_rizzle_sprysprocket") { } mob_rizzle_sprysprocket() : CreatureScript("mob_rizzle_sprysprocket") { }
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->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1 && player->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true); creature->CastSpell(player, SPELL_GIVE_SOUTHFURY_MOONSTONE, true);
CAST_AI(mob_rizzle_sprysprocket::mob_rizzle_sprysprocketAI, creature->AI())->Must_Die_Timer = 3000; CAST_AI(mob_rizzle_sprysprocket::mob_rizzle_sprysprocketAI, creature->AI())->Must_Die_Timer = 3000;
CAST_AI(mob_rizzle_sprysprocket::mob_rizzle_sprysprocketAI, creature->AI())->Must_Die = true; CAST_AI(mob_rizzle_sprysprocket::mob_rizzle_sprysprocketAI, creature->AI())->Must_Die = true;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(10994) != QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(10994) != QUEST_STATUS_INCOMPLETE)
return true; return true;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(10811, creature->GetGUID()); player->SEND_GOSSIP_MENU(10811, creature->GetGUID());
return true; return true;
} }
@@ -361,8 +361,8 @@ public:
me->AI_SendMoveToPacket(3706.39f, -3969.15f, 35.9118f, 0, 0, 0); me->AI_SendMoveToPacket(3706.39f, -3969.15f, 35.9118f, 0, 0, 0);
} }
//begin swimming and summon depth charges //begin swimming and summon depth charges
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
SendText(MSG_ESCAPE_NOTICE, pPlayer); SendText(MSG_ESCAPE_NOTICE, player);
DoCast(me, SPELL_PERIODIC_DEPTH_CHARGE); DoCast(me, SPELL_PERIODIC_DEPTH_CHARGE);
me->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_SWIMMING); me->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_SWIMMING);
me->SetSpeed(MOVE_RUN, 0.85f, true); me->SetSpeed(MOVE_RUN, 0.85f, true);
@@ -382,25 +382,25 @@ public:
if (Grenade_Timer <= diff) if (Grenade_Timer <= diff)
{ {
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer) if (player)
{ {
DoScriptText(SAY_RIZZLE_GRENADE, me, pPlayer); DoScriptText(SAY_RIZZLE_GRENADE, me, player);
DoCast(pPlayer, SPELL_RIZZLE_FROST_GRENADE, true); DoCast(player, SPELL_RIZZLE_FROST_GRENADE, true);
} }
Grenade_Timer = 30000; Grenade_Timer = 30000;
} else Grenade_Timer -= diff; } else Grenade_Timer -= diff;
if (Check_Timer <= diff) if (Check_Timer <= diff)
{ {
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer) if (!player)
{ {
me->DespawnOrUnsummon(); me->DespawnOrUnsummon();
return; return;
} }
if (me->IsWithinDist(pPlayer, 10) && me->GetPositionX() > pPlayer->GetPositionX() && !Reached) if (me->IsWithinDist(player, 10) && me->GetPositionX() > player->GetPositionX() && !Reached)
{ {
DoScriptText(SAY_RIZZLE_FINAL, me); DoScriptText(SAY_RIZZLE_FINAL, me);
me->SetUInt32Value(UNIT_NPC_FLAGS, 1); me->SetUInt32Value(UNIT_NPC_FLAGS, 1);
@@ -415,11 +415,11 @@ public:
} }
void SendText(int32 iTextEntry, Player* pPlayer) void SendText(int32 iTextEntry, Player* player)
{ {
LocaleConstant loc_idx = pPlayer->GetSession()->GetSessionDbLocaleIndex(); LocaleConstant loc_idx = player->GetSession()->GetSessionDbLocaleIndex();
const char* text = sObjectMgr->GetTrinityString(iTextEntry, loc_idx); const char* text = sObjectMgr->GetTrinityString(iTextEntry, loc_idx);
sWorld->SendServerMessage(SERVER_MSG_STRING, text, pPlayer); sWorld->SendServerMessage(SERVER_MSG_STRING, text, player);
} }
void AttackStart(Unit* who) void AttackStart(Unit* who)
src/server/scripts/Kalimdor/azuremyst_isle.cpp
+24 -24
View File
@@ -134,11 +134,11 @@ public:
{ {
me->RemoveAurasDueToSpell(SPELL_IRRIDATION); me->RemoveAurasDueToSpell(SPELL_IRRIDATION);
if (Player* pPlayer = Unit::GetPlayer(*me, pCaster)) if (Player* player = Unit::GetPlayer(*me, pCaster))
{ {
DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, pPlayer); DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, player);
pPlayer->TalkedToCreature(me->GetEntry(), me->GetGUID()); player->TalkedToCreature(me->GetEntry(), me->GetGUID());
} }
me->GetMotionMaster()->Clear(); me->GetMotionMaster()->Clear();
@@ -195,24 +195,24 @@ class npc_engineer_spark_overgrind : public CreatureScript
public: public:
npc_engineer_spark_overgrind() : CreatureScript("npc_engineer_spark_overgrind") { } npc_engineer_spark_overgrind() : CreatureScript("npc_engineer_spark_overgrind") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->setFaction(FACTION_HOSTILE); creature->setFaction(FACTION_HOSTILE);
CAST_AI(npc_engineer_spark_overgrind::npc_engineer_spark_overgrindAI, creature->AI())->AttackStart(pPlayer); CAST_AI(npc_engineer_spark_overgrind::npc_engineer_spark_overgrindAI, creature->AI())->AttackStart(player);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -349,13 +349,13 @@ class npc_magwin : public CreatureScript
public: public:
npc_magwin() : CreatureScript("npc_magwin") { } npc_magwin() : CreatureScript("npc_magwin") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP) if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP)
{ {
creature->setFaction(113); creature->setFaction(113);
if (npc_escortAI* pEscortAI = CAST_AI(npc_escortAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_escortAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
} }
return true; return true;
} }
@@ -371,26 +371,26 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(i) switch(i)
{ {
case 0: case 0:
DoScriptText(SAY_START, me, pPlayer); DoScriptText(SAY_START, me, player);
break; break;
case 17: case 17:
DoScriptText(SAY_PROGRESS, me, pPlayer); DoScriptText(SAY_PROGRESS, me, player);
break; break;
case 28: case 28:
DoScriptText(SAY_END1, me, pPlayer); DoScriptText(SAY_END1, me, player);
break; break;
case 29: case 29:
DoScriptText(EMOTE_HUG, me, pPlayer); DoScriptText(EMOTE_HUG, me, player);
DoScriptText(SAY_END2, me, pPlayer); DoScriptText(SAY_END2, me, player);
pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me); player->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me);
break; break;
} }
} }
@@ -586,15 +586,15 @@ class go_ravager_cage : public GameObjectScript
public: public:
go_ravager_cage() : GameObjectScript("go_ravager_cage") { } go_ravager_cage() : GameObjectScript("go_ravager_cage") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo) bool OnGossipHello(Player* player, GameObject* pGo)
{ {
if (pPlayer->GetQuestStatus(QUEST_STRENGTH_ONE) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_STRENGTH_ONE) == QUEST_STATUS_INCOMPLETE)
{ {
if (Creature* ravager = pGo->FindNearestCreature(NPC_DEATH_RAVAGER, 5.0f, true)) if (Creature* ravager = pGo->FindNearestCreature(NPC_DEATH_RAVAGER, 5.0f, true))
{ {
ravager->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); ravager->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
ravager->SetReactState(REACT_AGGRESSIVE); ravager->SetReactState(REACT_AGGRESSIVE);
ravager->AI()->AttackStart(pPlayer); ravager->AI()->AttackStart(player);
} }
} }
return true ; return true ;
src/server/scripts/Kalimdor/bloodmyst_isle.cpp
+19 -19
View File
@@ -101,48 +101,48 @@ class npc_captured_sunhawk_agent : public CreatureScript
public: public:
npc_captured_sunhawk_agent() : CreatureScript("npc_captured_sunhawk_agent") { } npc_captured_sunhawk_agent() : CreatureScript("npc_captured_sunhawk_agent") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(9137, creature->GetGUID()); player->SEND_GOSSIP_MENU(9137, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(9138, creature->GetGUID()); player->SEND_GOSSIP_MENU(9138, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(9139, creature->GetGUID()); player->SEND_GOSSIP_MENU(9139, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(9140, creature->GetGUID()); player->SEND_GOSSIP_MENU(9140, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(9141, creature->GetGUID()); player->SEND_GOSSIP_MENU(9141, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->TalkedToCreature(C_SUNHAWK_TRIGGER, creature->GetGUID()); player->TalkedToCreature(C_SUNHAWK_TRIGGER, creature->GetGUID());
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->HasAura(31609) && pPlayer->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE) if (player->HasAura(31609) && player->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_CSA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_CSA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(9136, creature->GetGUID()); player->SEND_GOSSIP_MENU(9136, creature->GetGUID());
} }
else else
pPlayer->SEND_GOSSIP_MENU(9134, creature->GetGUID()); player->SEND_GOSSIP_MENU(9134, creature->GetGUID());
return true; return true;
} }
src/server/scripts/Kalimdor/darkshore.cpp
+31 -31
View File
@@ -70,15 +70,15 @@ class npc_kerlonian : public CreatureScript
public: public:
npc_kerlonian() : CreatureScript("npc_kerlonian") { } npc_kerlonian() : CreatureScript("npc_kerlonian") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_SLEEPER_AWAKENED) if (pQuest->GetQuestId() == QUEST_SLEEPER_AWAKENED)
{ {
if (npc_kerlonianAI* pKerlonianAI = CAST_AI(npc_kerlonian::npc_kerlonianAI, creature->AI())) if (npc_kerlonianAI* pKerlonianAI = CAST_AI(npc_kerlonian::npc_kerlonianAI, creature->AI()))
{ {
creature->SetStandState(UNIT_STAND_STATE_STAND); creature->SetStandState(UNIT_STAND_STATE_STAND);
DoScriptText(SAY_KER_START, creature, pPlayer); DoScriptText(SAY_KER_START, creature, player);
pKerlonianAI->StartFollow(pPlayer, FACTION_KER_ESCORTEE, pQuest); pKerlonianAI->StartFollow(player, FACTION_KER_ESCORTEE, pQuest);
} }
} }
@@ -109,10 +109,10 @@ public:
{ {
if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE*5)) if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE*5))
{ {
if (Player* pPlayer = GetLeaderForFollower()) if (Player* player = GetLeaderForFollower())
{ {
if (pPlayer->GetQuestStatus(QUEST_SLEEPER_AWAKENED) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_SLEEPER_AWAKENED) == QUEST_STATUS_INCOMPLETE)
pPlayer->GroupEventHappens(QUEST_SLEEPER_AWAKENED, me); player->GroupEventHappens(QUEST_SLEEPER_AWAKENED, me);
DoScriptText(SAY_KER_END, me); DoScriptText(SAY_KER_END, me);
} }
@@ -209,12 +209,12 @@ class npc_prospector_remtravel : public CreatureScript
public: public:
npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") { } npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_ABSENT_MINDED_PT2) if (pQuest->GetQuestId() == QUEST_ABSENT_MINDED_PT2)
{ {
if (npc_escortAI* pEscortAI = CAST_AI(npc_prospector_remtravel::npc_prospector_remtravelAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_prospector_remtravel::npc_prospector_remtravelAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID()); pEscortAI->Start(false, false, player->GetGUID());
creature->setFaction(FACTION_ESCORTEE); creature->setFaction(FACTION_ESCORTEE);
} }
@@ -233,48 +233,48 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(i) switch(i)
{ {
case 0: case 0:
DoScriptText(SAY_REM_START, me, pPlayer); DoScriptText(SAY_REM_START, me, player);
break; break;
case 5: case 5:
DoScriptText(SAY_REM_RAMP1_1, me, pPlayer); DoScriptText(SAY_REM_RAMP1_1, me, player);
break; break;
case 6: case 6:
DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break; break;
case 9: case 9:
DoScriptText(SAY_REM_RAMP1_2, me, pPlayer); DoScriptText(SAY_REM_RAMP1_2, me, player);
break; break;
case 14: case 14:
//depend quest rewarded? //depend quest rewarded?
DoScriptText(SAY_REM_BOOK, me, pPlayer); DoScriptText(SAY_REM_BOOK, me, player);
break; break;
case 15: case 15:
DoScriptText(SAY_REM_TENT1_1, me, pPlayer); DoScriptText(SAY_REM_TENT1_1, me, player);
break; break;
case 16: case 16:
DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break; break;
case 17: case 17:
DoScriptText(SAY_REM_TENT1_2, me, pPlayer); DoScriptText(SAY_REM_TENT1_2, me, player);
break; break;
case 26: case 26:
DoScriptText(SAY_REM_MOSS, me, pPlayer); DoScriptText(SAY_REM_MOSS, me, player);
break; break;
case 27: case 27:
DoScriptText(EMOTE_REM_MOSS, me, pPlayer); DoScriptText(EMOTE_REM_MOSS, me, player);
break; break;
case 28: case 28:
DoScriptText(SAY_REM_MOSS_PROGRESS, me, pPlayer); DoScriptText(SAY_REM_MOSS_PROGRESS, me, player);
break; break;
case 29: case 29:
DoSpawnCreature(NPC_GRAVEL_SCOUT, -15.0f, 3.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_SCOUT, -15.0f, 3.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
@@ -282,14 +282,14 @@ public:
DoSpawnCreature(NPC_GRAVEL_GEO, -15.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_GEO, -15.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break; break;
case 31: case 31:
DoScriptText(SAY_REM_PROGRESS, me, pPlayer); DoScriptText(SAY_REM_PROGRESS, me, player);
break; break;
case 41: case 41:
DoScriptText(SAY_REM_REMEMBER, me, pPlayer); DoScriptText(SAY_REM_REMEMBER, me, player);
break; break;
case 42: case 42:
DoScriptText(EMOTE_REM_END, me, pPlayer); DoScriptText(EMOTE_REM_END, me, player);
pPlayer->GroupEventHappens(QUEST_ABSENT_MINDED_PT2, me); player->GroupEventHappens(QUEST_ABSENT_MINDED_PT2, me);
break; break;
} }
} }
@@ -331,29 +331,29 @@ class npc_threshwackonator : public CreatureScript
public: public:
npc_threshwackonator() : CreatureScript("npc_threshwackonator") { } npc_threshwackonator() : CreatureScript("npc_threshwackonator") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (npc_threshwackonatorAI* pThreshAI = CAST_AI(npc_threshwackonator::npc_threshwackonatorAI, creature->AI())) if (npc_threshwackonatorAI* pThreshAI = CAST_AI(npc_threshwackonator::npc_threshwackonatorAI, creature->AI()))
{ {
DoScriptText(EMOTE_START, creature); DoScriptText(EMOTE_START, creature);
pThreshAI->StartFollow(pPlayer); pThreshAI->StartFollow(player);
} }
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INSERT_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INSERT_KEY, 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; return true;
} }
src/server/scripts/Kalimdor/desolace.cpp
+16 -16
View File
@@ -57,18 +57,18 @@ class npc_aged_dying_ancient_kodo : public CreatureScript
public: public:
npc_aged_dying_ancient_kodo() : CreatureScript("npc_aged_dying_ancient_kodo") { } npc_aged_dying_ancient_kodo() : CreatureScript("npc_aged_dying_ancient_kodo") { }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF)) if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF))
{ {
//the expected quest objective //the expected quest objective
pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
pPlayer->RemoveAurasDueToSpell(SPELL_KODO_KOMBO_PLAYER_BUFF); player->RemoveAurasDueToSpell(SPELL_KODO_KOMBO_PLAYER_BUFF);
creature->GetMotionMaster()->MoveIdle(); creature->GetMotionMaster()->MoveIdle();
} }
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -176,10 +176,10 @@ class go_iruxos : public GameObjectScript
public: public:
go_iruxos() : GameObjectScript("go_iruxos") { } go_iruxos() : GameObjectScript("go_iruxos") { }
bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{ {
if (pPlayer->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE)
pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(), pPlayer->GetInnPosY(), pPlayer->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); player->SummonCreature(11876, player->GetInnPosX(), player->GetInnPosY(), player->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
return true; return true;
} }
@@ -197,13 +197,13 @@ class npc_dalinda : public CreatureScript
public: public:
npc_dalinda() : CreatureScript("npc_dalinda") { } npc_dalinda() : CreatureScript("npc_dalinda") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL) if (quest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL)
{ {
if (npc_escortAI* pEscortAI = CAST_AI(npc_dalinda::npc_dalindaAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_dalinda::npc_dalindaAI, creature->AI()))
{ {
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
creature->setFaction(113); creature->setFaction(113);
} }
} }
@@ -221,15 +221,15 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
switch (i) switch (i)
{ {
case 1: case 1:
me->IsStandState(); me->IsStandState();
break; break;
case 15: case 15:
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_RETURN_TO_VAHLARRIEL, me); player->GroupEventHappens(QUEST_RETURN_TO_VAHLARRIEL, me);
break; break;
} }
} }
@@ -240,9 +240,9 @@ public:
void JustDied(Unit* /*pKiller*/) void JustDied(Unit* /*pKiller*/)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (pPlayer) if (player)
pPlayer->FailQuest(QUEST_RETURN_TO_VAHLARRIEL); player->FailQuest(QUEST_RETURN_TO_VAHLARRIEL);
return; return;
} }
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+59 -59
View File
@@ -147,32 +147,32 @@ class npc_deserter_agitator : public CreatureScript
public: public:
npc_deserter_agitator() : CreatureScript("npc_deserter_agitator") { } npc_deserter_agitator() : CreatureScript("npc_deserter_agitator") { }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_TRAITORS_AMONG_US) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_TRAITORS_AMONG_US) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DESERTER, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DESERTER, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; 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_SENDER_INFO) if (uiAction == GOSSIP_SENDER_INFO)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
switch (urand(0, 1)) switch (urand(0, 1))
{ {
case 0: case 0:
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
creature->setFaction(14); creature->setFaction(14);
creature->AI()->AttackStart(pPlayer); creature->AI()->AttackStart(player);
break; break;
case 1: case 1:
pPlayer->KilledMonsterCredit(NPC_THERAMORE_DESERTER, 0); player->KilledMonsterCredit(NPC_THERAMORE_DESERTER, 0);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
creature->SetSpeed(MOVE_RUN, creature->GetSpeedRate(MOVE_RUN), true); creature->SetSpeed(MOVE_RUN, creature->GetSpeedRate(MOVE_RUN), true);
creature->setFaction(35); creature->setFaction(35);
@@ -245,24 +245,24 @@ class npc_theramore_guard : public CreatureScript
public: public:
npc_theramore_guard() : CreatureScript("npc_theramore_guard") { } npc_theramore_guard() : CreatureScript("npc_theramore_guard") { }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; 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_SENDER_INFO) if (uiAction == GOSSIP_SENDER_INFO)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0); player->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0);
DoScriptText(SAY_QUEST1, creature); DoScriptText(SAY_QUEST1, creature);
creature->CastSpell(creature, SPELL_DOCTORED_LEAFLET, false); creature->CastSpell(creature, SPELL_DOCTORED_LEAFLET, false);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -337,26 +337,26 @@ class npc_lady_jaina_proudmoore : public CreatureScript
public: public:
npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { } npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { }
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_SENDER_INFO) if (uiAction == GOSSIP_SENDER_INFO)
{ {
pPlayer->SEND_GOSSIP_MENU(7012, creature->GetGUID()); player->SEND_GOSSIP_MENU(7012, creature->GetGUID());
pPlayer->CastSpell(pPlayer, SPELL_JAINAS_AUTOGRAPH, false); player->CastSpell(player, SPELL_JAINAS_AUTOGRAPH, false);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_JAINAS_AUTOGRAPH) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_JAINAS_AUTOGRAPH) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -377,27 +377,27 @@ class npc_nat_pagle : public CreatureScript
public: public:
npc_nat_pagle() : CreatureScript("npc_nat_pagle") { } npc_nat_pagle() : CreatureScript("npc_nat_pagle") { }
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) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->GetSession()->SendListInventory(creature->GetGUID()); player->GetSession()->SendListInventory(creature->GetGUID());
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetQuestRewardStatus(QUEST_NATS_MEASURING_TAPE)) if (creature->isVendor() && player->GetQuestRewardStatus(QUEST_NATS_MEASURING_TAPE))
{ {
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);
pPlayer->SEND_GOSSIP_MENU(7640, creature->GetGUID()); player->SEND_GOSSIP_MENU(7640, creature->GetGUID());
} }
else else
pPlayer->SEND_GOSSIP_MENU(7638, creature->GetGUID()); player->SEND_GOSSIP_MENU(7638, creature->GetGUID());
return true; return true;
} }
@@ -431,7 +431,7 @@ class npc_private_hendel : public CreatureScript
public: public:
npc_private_hendel() : CreatureScript("npc_private_hendel") { } npc_private_hendel() : CreatureScript("npc_private_hendel") { }
bool OnQuestAccept(Player* /*pPlayer*/, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT16)
creature->setFaction(FACTION_HOSTILE); creature->setFaction(FACTION_HOSTILE);
@@ -470,8 +470,8 @@ public:
{ {
uiDamage = 0; uiDamage = 0;
if (Player* pPlayer = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself()) if (Player* player = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself())
pPlayer->GroupEventHappens(QUEST_MISSING_DIPLO_PT16, me); player->GroupEventHappens(QUEST_MISSING_DIPLO_PT16, me);
DoScriptText(EMOTE_SURRENDER, me); DoScriptText(EMOTE_SURRENDER, me);
EnterEvadeMode(); EnterEvadeMode();
@@ -588,7 +588,7 @@ public:
return new npc_stinkyAI(creature); return new npc_stinkyAI(creature);
} }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const *quest)
{ {
if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || QUEST_STINKYS_ESCAPE_A) if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || QUEST_STINKYS_ESCAPE_A)
{ {
@@ -597,7 +597,7 @@ public:
creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE); creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
creature->SetStandState(UNIT_STAND_STATE_STAND); creature->SetStandState(UNIT_STAND_STATE_STAND);
DoScriptText(SAY_QUEST_ACCEPTED, creature); DoScriptText(SAY_QUEST_ACCEPTED, creature);
pEscortAI->Start(false, false, pPlayer->GetGUID()); pEscortAI->Start(false, false, player->GetGUID());
} }
} }
return true; return true;
@@ -609,42 +609,42 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch (i) switch (i)
{ {
case 7: case 7:
DoScriptText(SAY_STAY_1, me, pPlayer); DoScriptText(SAY_STAY_1, me, player);
break; break;
case 11: case 11:
DoScriptText(SAY_STAY_2, me, pPlayer); DoScriptText(SAY_STAY_2, me, player);
break; break;
case 25: case 25:
DoScriptText(SAY_STAY_3, me, pPlayer); DoScriptText(SAY_STAY_3, me, player);
break; break;
case 26: case 26:
DoScriptText(SAY_STAY_4, me, pPlayer); DoScriptText(SAY_STAY_4, me, player);
break; break;
case 27: case 27:
DoScriptText(SAY_STAY_5, me, pPlayer); DoScriptText(SAY_STAY_5, me, player);
break; break;
case 28: case 28:
DoScriptText(SAY_STAY_6, me, pPlayer); DoScriptText(SAY_STAY_6, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL); me->SetStandState(UNIT_STAND_STATE_KNEEL);
break; break;
case 29: case 29:
me->SetStandState(UNIT_STAND_STATE_STAND); me->SetStandState(UNIT_STAND_STATE_STAND);
break; break;
case 37: case 37:
DoScriptText(SAY_QUEST_COMPLETE, me, pPlayer); DoScriptText(SAY_QUEST_COMPLETE, me, player);
me->SetSpeed(MOVE_RUN, 1.2f, true); me->SetSpeed(MOVE_RUN, 1.2f, true);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (pPlayer && pPlayer->GetQuestStatus(QUEST_STINKYS_ESCAPE_H)) if (player && player->GetQuestStatus(QUEST_STINKYS_ESCAPE_H))
pPlayer->GroupEventHappens(QUEST_STINKYS_ESCAPE_H, me); player->GroupEventHappens(QUEST_STINKYS_ESCAPE_H, me);
if (pPlayer && pPlayer->GetQuestStatus(QUEST_STINKYS_ESCAPE_A)) if (player && player->GetQuestStatus(QUEST_STINKYS_ESCAPE_A))
pPlayer->GroupEventHappens(QUEST_STINKYS_ESCAPE_A, me); player->GroupEventHappens(QUEST_STINKYS_ESCAPE_A, me);
break; break;
case 39: case 39:
DoScriptText(EMOTE_DISAPPEAR, me); DoScriptText(EMOTE_DISAPPEAR, me);
@@ -662,13 +662,13 @@ public:
void JustDied(Unit* /*pKiller*/) void JustDied(Unit* /*pKiller*/)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (HasEscortState(STATE_ESCORT_ESCORTING) && pPlayer) if (HasEscortState(STATE_ESCORT_ESCORTING) && player)
{ {
if (pPlayer->GetQuestStatus(QUEST_STINKYS_ESCAPE_H)) if (player->GetQuestStatus(QUEST_STINKYS_ESCAPE_H))
pPlayer->FailQuest(QUEST_STINKYS_ESCAPE_H); player->FailQuest(QUEST_STINKYS_ESCAPE_H);
if (pPlayer->GetQuestStatus(QUEST_STINKYS_ESCAPE_A)) if (player->GetQuestStatus(QUEST_STINKYS_ESCAPE_A))
pPlayer->FailQuest(QUEST_STINKYS_ESCAPE_A); player->FailQuest(QUEST_STINKYS_ESCAPE_A);
} }
} }
src/server/scripts/Kalimdor/felwood.cpp
+18 -18
View File
@@ -40,46 +40,46 @@ class npcs_riverbreeze_and_silversky : public CreatureScript
public: public:
npcs_riverbreeze_and_silversky() : CreatureScript("npcs_riverbreeze_and_silversky") { } npcs_riverbreeze_and_silversky() : CreatureScript("npcs_riverbreeze_and_silversky") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 15120, false); creature->CastSpell(player, 15120, false);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
uint32 eCreature = creature->GetEntry(); uint32 eCreature = creature->GetEntry();
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (eCreature == 9528) if (eCreature == 9528)
{ {
if (pPlayer->GetQuestRewardStatus(4101)) if (player->GetQuestRewardStatus(4101))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(2848, creature->GetGUID()); player->SEND_GOSSIP_MENU(2848, creature->GetGUID());
} else if (pPlayer->GetTeam() == HORDE) } else if (player->GetTeam() == HORDE)
pPlayer->SEND_GOSSIP_MENU(2845, creature->GetGUID()); player->SEND_GOSSIP_MENU(2845, creature->GetGUID());
else else
pPlayer->SEND_GOSSIP_MENU(2844, creature->GetGUID()); player->SEND_GOSSIP_MENU(2844, creature->GetGUID());
} }
if (eCreature == 9529) if (eCreature == 9529)
{ {
if (pPlayer->GetQuestRewardStatus(4102)) if (player->GetQuestRewardStatus(4102))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(2849, creature->GetGUID()); player->SEND_GOSSIP_MENU(2849, creature->GetGUID());
} else if (pPlayer->GetTeam() == ALLIANCE) } else if (player->GetTeam() == ALLIANCE)
pPlayer->SEND_GOSSIP_MENU(2843, creature->GetGUID()); player->SEND_GOSSIP_MENU(2843, creature->GetGUID());
else else
pPlayer->SEND_GOSSIP_MENU(2842, creature->GetGUID()); player->SEND_GOSSIP_MENU(2842, creature->GetGUID());
} }
return true; return true;
src/server/scripts/Kalimdor/feralas.cpp
+19 -19
View File
@@ -37,28 +37,28 @@ class npc_gregan_brewspewer : public CreatureScript
public: public:
npc_gregan_brewspewer() : CreatureScript("npc_gregan_brewspewer") { } npc_gregan_brewspewer() : CreatureScript("npc_gregan_brewspewer") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
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);
pPlayer->SEND_GOSSIP_MENU(2434, creature->GetGUID()); player->SEND_GOSSIP_MENU(2434, creature->GetGUID());
} }
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->GetSession()->SendListInventory(creature->GetGUID()); player->GetSession()->SendListInventory(creature->GetGUID());
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE) if (creature->isVendor() && player->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(2433, creature->GetGUID()); player->SEND_GOSSIP_MENU(2433, creature->GetGUID());
return true; return true;
} }
@@ -94,7 +94,7 @@ class npc_oox22fe : public CreatureScript
public: public:
npc_oox22fe() : CreatureScript("npc_oox22fe") { } npc_oox22fe() : CreatureScript("npc_oox22fe") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_RESCUE_OOX22FE) if (pQuest->GetQuestId() == QUEST_RESCUE_OOX22FE)
{ {
@@ -102,14 +102,14 @@ public:
//change that the npc is not lying dead on the ground //change that the npc is not lying dead on the ground
creature->SetStandState(UNIT_STAND_STATE_STAND); creature->SetStandState(UNIT_STAND_STATE_STAND);
if (pPlayer->GetTeam() == ALLIANCE) if (player->GetTeam() == ALLIANCE)
creature->setFaction(FACTION_ESCORTEE_A); creature->setFaction(FACTION_ESCORTEE_A);
if (pPlayer->GetTeam() == HORDE) if (player->GetTeam() == HORDE)
creature->setFaction(FACTION_ESCORTEE_H); creature->setFaction(FACTION_ESCORTEE_H);
if (npc_escortAI* pEscortAI = CAST_AI(npc_oox22fe::npc_oox22feAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_oox22fe::npc_oox22feAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
} }
return true; return true;
@@ -153,9 +153,9 @@ public:
case 37: case 37:
DoScriptText(SAY_OOX_END, me); DoScriptText(SAY_OOX_END, me);
// Award quest credit // Award quest credit
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
{ {
pPlayer->GroupEventHappens(QUEST_RESCUE_OOX22FE, me); player->GroupEventHappens(QUEST_RESCUE_OOX22FE, me);
} }
break; break;
} }
@@ -191,10 +191,10 @@ class npc_screecher_spirit : public CreatureScript
public: public:
npc_screecher_spirit() : CreatureScript("npc_screecher_spirit") { } npc_screecher_spirit() : CreatureScript("npc_screecher_spirit") { }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
pPlayer->SEND_GOSSIP_MENU(2039, creature->GetGUID()); player->SEND_GOSSIP_MENU(2039, creature->GetGUID());
pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return true; return true;
src/server/scripts/Kalimdor/moonglade.cpp
+79 -79
View File
@@ -54,45 +54,45 @@ class npc_bunthen_plainswind : public CreatureScript
public: public:
npc_bunthen_plainswind() : CreatureScript("npc_bunthen_plainswind") { } npc_bunthen_plainswind() : CreatureScript("npc_bunthen_plainswind") { }
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) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE) if (player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE)
pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE); player->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE);
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->SEND_GOSSIP_MENU(5373, creature->GetGUID()); player->SEND_GOSSIP_MENU(5373, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(5376, creature->GetGUID()); player->SEND_GOSSIP_MENU(5376, creature->GetGUID());
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->getClass() != CLASS_DRUID) if (player->getClass() != CLASS_DRUID)
pPlayer->SEND_GOSSIP_MENU(4916, creature->GetGUID()); player->SEND_GOSSIP_MENU(4916, creature->GetGUID());
else if (pPlayer->GetTeam() != HORDE) else if (player->GetTeam() != HORDE)
{ {
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(4917, creature->GetGUID()); player->SEND_GOSSIP_MENU(4917, creature->GetGUID());
} }
else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE) else if (player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THUNDER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THUNDER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(4918, creature->GetGUID()); player->SEND_GOSSIP_MENU(4918, creature->GetGUID());
} }
return true; return true;
} }
@@ -113,44 +113,44 @@ class npc_great_bear_spirit : public CreatureScript
public: public:
npc_great_bear_spirit() : CreatureScript("npc_great_bear_spirit") { } npc_great_bear_spirit() : CreatureScript("npc_great_bear_spirit") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(4721, creature->GetGUID()); player->SEND_GOSSIP_MENU(4721, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(4733, creature->GetGUID()); player->SEND_GOSSIP_MENU(4733, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(4734, creature->GetGUID()); player->SEND_GOSSIP_MENU(4734, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(4735, creature->GetGUID()); player->SEND_GOSSIP_MENU(4735, creature->GetGUID());
if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(5929); player->AreaExploredOrEventHappens(5929);
if (pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(5930); player->AreaExploredOrEventHappens(5930);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
//ally or horde quest //ally or horde quest
if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(4719, creature->GetGUID()); player->SEND_GOSSIP_MENU(4719, creature->GetGUID());
} }
else else
pPlayer->SEND_GOSSIP_MENU(4718, creature->GetGUID()); player->SEND_GOSSIP_MENU(4718, creature->GetGUID());
return true; return true;
} }
@@ -169,45 +169,45 @@ class npc_silva_filnaveth : public CreatureScript
public: public:
npc_silva_filnaveth() : CreatureScript("npc_silva_filnaveth") { } npc_silva_filnaveth() : CreatureScript("npc_silva_filnaveth") { }
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) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE) if (player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE)
pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY); player->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY);
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->SEND_GOSSIP_MENU(5374, creature->GetGUID()); player->SEND_GOSSIP_MENU(5374, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(5375, creature->GetGUID()); player->SEND_GOSSIP_MENU(5375, creature->GetGUID());
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->getClass() != CLASS_DRUID) if (player->getClass() != CLASS_DRUID)
pPlayer->SEND_GOSSIP_MENU(4913, creature->GetGUID()); player->SEND_GOSSIP_MENU(4913, creature->GetGUID());
else if (pPlayer->GetTeam() != ALLIANCE) else if (player->GetTeam() != ALLIANCE)
{ {
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(4915, creature->GetGUID()); player->SEND_GOSSIP_MENU(4915, creature->GetGUID());
} }
else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE) else if (player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RUTHERAN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RUTHERAN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(4914, creature->GetGUID()); player->SEND_GOSSIP_MENU(4914, creature->GetGUID());
} }
return true; return true;
} }
@@ -325,10 +325,10 @@ public:
if (!PlayerGUID) if (!PlayerGUID)
return; return;
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE) if (player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
{ {
pPlayer->FailQuest(10965); player->FailQuest(10965);
PlayerGUID = 0; PlayerGUID = 0;
Reset(); Reset();
} }
@@ -336,10 +336,10 @@ public:
void EnterEvadeMode() void EnterEvadeMode()
{ {
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper()) if (player && player->isInCombat() && player->getAttackerForHelper())
{ {
AttackStart(pPlayer->getAttackerForHelper()); AttackStart(player->getAttackerForHelper());
return; return;
} }
npc_escortAI::EnterEvadeMode(); npc_escortAI::EnterEvadeMode();
@@ -355,17 +355,17 @@ public:
} }
} }
void StartEvent(Player* pPlayer) void StartEvent(Player* player)
{ {
if (!pPlayer) if (!player)
return; return;
if (pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
{ {
for (uint8 i = 0; i < 41; ++i) for (uint8 i = 0; i < 41; ++i)
{ {
AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]); AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]);
} }
PlayerGUID = pPlayer->GetGUID(); PlayerGUID = player->GetGUID();
Start(true, false, PlayerGUID); Start(true, false, PlayerGUID);
} }
return; return;
@@ -385,9 +385,9 @@ public:
{ {
if (checkPlayer_Timer <= diff) if (checkPlayer_Timer <= diff)
{ {
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper()) if (player && player->isInCombat() && player->getAttackerForHelper())
AttackStart(pPlayer->getAttackerForHelper()); AttackStart(player->getAttackerForHelper());
checkPlayer_Timer = 1000; checkPlayer_Timer = 1000;
} else checkPlayer_Timer -= diff; } else checkPlayer_Timer -= diff;
} }
@@ -395,8 +395,8 @@ public:
if (Event_onWait && Event_Timer <= diff) if (Event_onWait && Event_Timer <= diff)
{ {
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer || (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_NONE)) if (!player || (player && player->GetQuestStatus(10965) == QUEST_STATUS_NONE))
{ {
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
return; return;
@@ -427,7 +427,7 @@ public:
break; break;
case 1: case 1:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
DoScriptText(CLINTAR_SPIRIT_SAY_GET_ONE, me, pPlayer); DoScriptText(CLINTAR_SPIRIT_SAY_GET_ONE, me, player);
Event_onWait = false; Event_onWait = false;
break; break;
} }
@@ -450,7 +450,7 @@ public:
switch(Step) switch(Step)
{ {
case 0: case 0:
DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, pPlayer); DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, player);
Event_Timer = 15000; Event_Timer = 15000;
Step = 1; Step = 1;
break; break;
@@ -497,7 +497,7 @@ public:
switch(Step) switch(Step)
{ {
case 0: case 0:
DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, pPlayer); DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, player);
Event_Timer = 4000; Event_Timer = 4000;
Step = 1; Step = 1;
break; break;
@@ -511,8 +511,8 @@ public:
{ {
case 0: case 0:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2);
DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, me, pPlayer); DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, me, player);
pPlayer->CompleteQuest(10965); player->CompleteQuest(10965);
Event_Timer = 1500; Event_Timer = 1500;
Step = 1; Step = 1;
break; break;
@@ -522,7 +522,7 @@ public:
Step = 2; Step = 2;
break; break;
case 2: case 2:
pPlayer->TalkedToCreature(me->GetEntry(), me->GetGUID()); player->TalkedToCreature(me->GetEntry(), me->GetGUID());
PlayerGUID = 0; PlayerGUID = 0;
Reset(); Reset();
me->setDeathState(JUST_DIED); me->setDeathState(JUST_DIED);
@@ -559,13 +559,13 @@ class npc_clintar_dreamwalker : public CreatureScript
public: public:
npc_clintar_dreamwalker() : CreatureScript("npc_clintar_dreamwalker") { } npc_clintar_dreamwalker() : CreatureScript("npc_clintar_dreamwalker") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const *quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const *quest)
{ {
if (quest->GetQuestId() == 10965) if (quest->GetQuestId() == 10965)
{ {
Creature* clintar_spirit = creature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000); Creature* clintar_spirit = creature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000);
if (clintar_spirit) if (clintar_spirit)
CAST_AI(npc_clintar_spirit::npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(pPlayer); CAST_AI(npc_clintar_spirit::npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(player);
} }
return true; return true;
} }
src/server/scripts/Kalimdor/mulgore.cpp
+8 -8
View File
@@ -43,24 +43,24 @@ class npc_skorn_whitecloud : public CreatureScript
public: public:
npc_skorn_whitecloud() : CreatureScript("npc_skorn_whitecloud") { } npc_skorn_whitecloud() : CreatureScript("npc_skorn_whitecloud") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
pPlayer->SEND_GOSSIP_MENU(523, creature->GetGUID()); player->SEND_GOSSIP_MENU(523, creature->GetGUID());
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (!pPlayer->GetQuestRewardStatus(770)) if (!player->GetQuestRewardStatus(770))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(522, creature->GetGUID()); player->SEND_GOSSIP_MENU(522, creature->GetGUID());
return true; return true;
} }
src/server/scripts/Kalimdor/orgrimmar.cpp
+29 -29
View File
@@ -44,12 +44,12 @@ class npc_shenthul : public CreatureScript
public: public:
npc_shenthul() : CreatureScript("npc_shenthul") { } npc_shenthul() : CreatureScript("npc_shenthul") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_SHATTERED_SALUTE) if (quest->GetQuestId() == QUEST_SHATTERED_SALUTE)
{ {
CAST_AI(npc_shenthul::npc_shenthulAI, creature->AI())->CanTalk = true; CAST_AI(npc_shenthul::npc_shenthulAI, creature->AI())->CanTalk = true;
CAST_AI(npc_shenthul::npc_shenthulAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(npc_shenthul::npc_shenthulAI, creature->AI())->PlayerGUID = player->GetGUID();
} }
return true; return true;
} }
@@ -86,10 +86,10 @@ public:
{ {
if (Reset_Timer <= diff) if (Reset_Timer <= diff)
{ {
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
{ {
if (pPlayer->GetTypeId() == TYPEID_PLAYER && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) if (player->GetTypeId() == TYPEID_PLAYER && player->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
pPlayer->FailQuest(QUEST_SHATTERED_SALUTE); player->FailQuest(QUEST_SHATTERED_SALUTE);
} }
Reset(); Reset();
} else Reset_Timer -= diff; } else Reset_Timer -= diff;
@@ -111,13 +111,13 @@ public:
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void ReceiveEmote(Player* pPlayer, uint32 emote) void ReceiveEmote(Player* player, uint32 emote)
{ {
if (emote == TEXT_EMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) if (emote == TEXT_EMOTE_SALUTE && player->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
{ {
if (CanEmote) if (CanEmote)
{ {
pPlayer->AreaExploredOrEventHappens(QUEST_SHATTERED_SALUTE); player->AreaExploredOrEventHappens(QUEST_SHATTERED_SALUTE);
Reset(); Reset();
} }
} }
@@ -149,52 +149,52 @@ class npc_thrall_warchief : public CreatureScript
public: public:
npc_thrall_warchief() : CreatureScript("npc_thrall_warchief") { } npc_thrall_warchief() : CreatureScript("npc_thrall_warchief") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(5733, creature->GetGUID()); player->SEND_GOSSIP_MENU(5733, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(5734, creature->GetGUID()); player->SEND_GOSSIP_MENU(5734, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(5735, creature->GetGUID()); player->SEND_GOSSIP_MENU(5735, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(5736, creature->GetGUID()); player->SEND_GOSSIP_MENU(5736, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(5737, creature->GetGUID()); player->SEND_GOSSIP_MENU(5737, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
pPlayer->SEND_GOSSIP_MENU(5738, creature->GetGUID()); player->SEND_GOSSIP_MENU(5738, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(QUEST_6566); player->AreaExploredOrEventHappens(QUEST_6566);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HTW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HTW, 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; return true;
} }
src/server/scripts/Kalimdor/silithus.cpp
+64 -64
View File
@@ -49,57 +49,57 @@ class npc_highlord_demitrian : public CreatureScript
public: public:
npc_highlord_demitrian() : CreatureScript("npc_highlord_demitrian") { } npc_highlord_demitrian() : CreatureScript("npc_highlord_demitrian") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(6842, creature->GetGUID()); player->SEND_GOSSIP_MENU(6842, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(6843, creature->GetGUID()); player->SEND_GOSSIP_MENU(6843, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(6844, creature->GetGUID()); player->SEND_GOSSIP_MENU(6844, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(6867, creature->GetGUID()); player->SEND_GOSSIP_MENU(6867, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(6868, creature->GetGUID()); player->SEND_GOSSIP_MENU(6868, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(6869, creature->GetGUID()); player->SEND_GOSSIP_MENU(6869, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->SEND_GOSSIP_MENU(6870, creature->GetGUID()); player->SEND_GOSSIP_MENU(6870, creature->GetGUID());
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 19016, 1); uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 19016, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
pPlayer->StoreNewItem(dest, 19016, true); player->StoreNewItem(dest, 19016, true);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(7785) == QUEST_STATUS_NONE && if (player->GetQuestStatus(7785) == QUEST_STATUS_NONE &&
(pPlayer->HasItemCount(18563, 1, false) || pPlayer->HasItemCount(18564, 1, false))) (player->HasItemCount(18563, 1, false) || player->HasItemCount(18564, 1, false)))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(6812, creature->GetGUID()); player->SEND_GOSSIP_MENU(6812, creature->GetGUID());
return true; return true;
} }
@@ -134,86 +134,86 @@ class npcs_rutgar_and_frankal : public CreatureScript
public: public:
npcs_rutgar_and_frankal() : CreatureScript("npcs_rutgar_and_frankal") { } npcs_rutgar_and_frankal() : CreatureScript("npcs_rutgar_and_frankal") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(7755, creature->GetGUID()); player->SEND_GOSSIP_MENU(7755, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(7756, creature->GetGUID()); player->SEND_GOSSIP_MENU(7756, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(7757, creature->GetGUID()); player->SEND_GOSSIP_MENU(7757, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(7758, creature->GetGUID()); player->SEND_GOSSIP_MENU(7758, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 4: case GOSSIP_ACTION_INFO_DEF + 4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
pPlayer->SEND_GOSSIP_MENU(7759, creature->GetGUID()); player->SEND_GOSSIP_MENU(7759, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 5: case GOSSIP_ACTION_INFO_DEF + 5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
pPlayer->SEND_GOSSIP_MENU(7760, creature->GetGUID()); player->SEND_GOSSIP_MENU(7760, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 6: case GOSSIP_ACTION_INFO_DEF + 6:
pPlayer->SEND_GOSSIP_MENU(7761, creature->GetGUID()); player->SEND_GOSSIP_MENU(7761, creature->GetGUID());
//'kill' our trigger to update quest status //'kill' our trigger to update quest status
pPlayer->KilledMonsterCredit(TRIGGER_RUTGAR, 0); player->KilledMonsterCredit(TRIGGER_RUTGAR, 0);
break; break;
case GOSSIP_ACTION_INFO_DEF + 9: case GOSSIP_ACTION_INFO_DEF + 9:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(7762, creature->GetGUID()); player->SEND_GOSSIP_MENU(7762, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 10: case GOSSIP_ACTION_INFO_DEF + 10:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(7763, creature->GetGUID()); player->SEND_GOSSIP_MENU(7763, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 11: case GOSSIP_ACTION_INFO_DEF + 11:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
pPlayer->SEND_GOSSIP_MENU(7764, creature->GetGUID()); player->SEND_GOSSIP_MENU(7764, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 12: case GOSSIP_ACTION_INFO_DEF + 12:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
pPlayer->SEND_GOSSIP_MENU(7765, creature->GetGUID()); player->SEND_GOSSIP_MENU(7765, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 13: case GOSSIP_ACTION_INFO_DEF + 13:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
pPlayer->SEND_GOSSIP_MENU(7766, creature->GetGUID()); player->SEND_GOSSIP_MENU(7766, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 14: case GOSSIP_ACTION_INFO_DEF + 14:
pPlayer->SEND_GOSSIP_MENU(7767, creature->GetGUID()); player->SEND_GOSSIP_MENU(7767, creature->GetGUID());
//'kill' our trigger to update quest status //'kill' our trigger to update quest status
pPlayer->KilledMonsterCredit(TRIGGER_FRANKAL, 0); player->KilledMonsterCredit(TRIGGER_FRANKAL, 0);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE && if (player->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
creature->GetEntry() == 15170 && creature->GetEntry() == 15170 &&
!pPlayer->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR)) !player->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (pPlayer->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE && if (player->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
creature->GetEntry() == 15171 && creature->GetEntry() == 15171 &&
pPlayer->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR)) player->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
pPlayer->SEND_GOSSIP_MENU(7754, creature->GetGUID()); player->SEND_GOSSIP_MENU(7754, creature->GetGUID());
return true; return true;
} }
@@ -998,12 +998,12 @@ public:
void CheckEventFail() void CheckEventFail()
{ {
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer) if (!player)
return; return;
if (Group *EventGroup = pPlayer->GetGroup()) if (Group *EventGroup = player->GetGroup())
{ {
Player* GroupMember; Player* GroupMember;
@@ -1029,7 +1029,7 @@ public:
++DeadMemberCount; ++DeadMemberCount;
} }
if (GroupMemberCount == FailedMemberCount || !pPlayer->IsWithinDistInMap(me, EVENT_AREA_RADIUS)) if (GroupMemberCount == FailedMemberCount || !player->IsWithinDistInMap(me, EVENT_AREA_RADIUS))
Failed = true; //only so event can restart Failed = true; //only so event can restart
} }
} }
src/server/scripts/Kalimdor/stonetalon_mountains.cpp
+24 -24
View File
@@ -46,40 +46,40 @@ class npc_braug_dimspirit : public CreatureScript
public: public:
npc_braug_dimspirit() : CreatureScript("npc_braug_dimspirit") { } npc_braug_dimspirit() : CreatureScript("npc_braug_dimspirit") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 6766, false); creature->CastSpell(player, 6766, false);
} }
if (uiAction == GOSSIP_ACTION_INFO_DEF+2) if (uiAction == GOSSIP_ACTION_INFO_DEF+2)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(6627); player->AreaExploredOrEventHappens(6627);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(6627) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(6627) == QUEST_STATUS_INCOMPLETE)
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(5820, creature->GetGUID()); player->SEND_GOSSIP_MENU(5820, creature->GetGUID());
} }
else else
pPlayer->SEND_GOSSIP_MENU(5819, creature->GetGUID()); player->SEND_GOSSIP_MENU(5819, creature->GetGUID());
return true; return true;
} }
@@ -116,9 +116,9 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(i) switch(i)
@@ -129,10 +129,10 @@ public:
me->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85f, -503.77f, -45.90f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); me->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85f, -503.77f, -45.90f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
me->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37f, -496.23f, -45.71f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); me->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37f, -496.23f, -45.71f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break; break;
case 18: me->SetInFront(pPlayer); case 18: me->SetInFront(player);
DoScriptText(SAY_END, me, pPlayer); DoScriptText(SAY_END, me, player);
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_PROTECT_KAYA, me); player->GroupEventHappens(QUEST_PROTECT_KAYA, me);
break; break;
} }
} }
@@ -145,12 +145,12 @@ public:
void Reset(){} void Reset(){}
}; };
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_PROTECT_KAYA) if (quest->GetQuestId() == QUEST_PROTECT_KAYA)
{ {
if (npc_escortAI* pEscortAI = CAST_AI(npc_kaya_flathoof::npc_kaya_flathoofAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_kaya_flathoof::npc_kaya_flathoofAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
DoScriptText(SAY_START, creature); DoScriptText(SAY_START, creature);
creature->setFaction(113); creature->setFaction(113);
src/server/scripts/Kalimdor/tanaris.cpp
+71 -71
View File
@@ -174,34 +174,34 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(i) switch(i)
{ {
case 0: DoScriptText(WHISPER_CUSTODIAN_1, me, pPlayer); break; case 0: DoScriptText(WHISPER_CUSTODIAN_1, me, player); break;
case 1: DoScriptText(WHISPER_CUSTODIAN_2, me, pPlayer); break; case 1: DoScriptText(WHISPER_CUSTODIAN_2, me, player); break;
case 2: DoScriptText(WHISPER_CUSTODIAN_3, me, pPlayer); break; case 2: DoScriptText(WHISPER_CUSTODIAN_3, me, player); break;
case 3: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break; case 3: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 5: DoScriptText(WHISPER_CUSTODIAN_5, me, pPlayer); break; case 5: DoScriptText(WHISPER_CUSTODIAN_5, me, player); break;
case 6: DoScriptText(WHISPER_CUSTODIAN_6, me, pPlayer); break; case 6: DoScriptText(WHISPER_CUSTODIAN_6, me, player); break;
case 7: DoScriptText(WHISPER_CUSTODIAN_7, me, pPlayer); break; case 7: DoScriptText(WHISPER_CUSTODIAN_7, me, player); break;
case 8: DoScriptText(WHISPER_CUSTODIAN_8, me, pPlayer); break; case 8: DoScriptText(WHISPER_CUSTODIAN_8, me, player); break;
case 9: DoScriptText(WHISPER_CUSTODIAN_9, me, pPlayer); break; case 9: DoScriptText(WHISPER_CUSTODIAN_9, me, player); break;
case 10: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break; case 10: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 13: DoScriptText(WHISPER_CUSTODIAN_10, me, pPlayer); break; case 13: DoScriptText(WHISPER_CUSTODIAN_10, me, player); break;
case 14: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break; case 14: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 16: DoScriptText(WHISPER_CUSTODIAN_11, me, pPlayer); break; case 16: DoScriptText(WHISPER_CUSTODIAN_11, me, player); break;
case 17: DoScriptText(WHISPER_CUSTODIAN_12, me, pPlayer); break; case 17: DoScriptText(WHISPER_CUSTODIAN_12, me, player); break;
case 18: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break; case 18: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 22: DoScriptText(WHISPER_CUSTODIAN_13, me, pPlayer); break; case 22: DoScriptText(WHISPER_CUSTODIAN_13, me, player); break;
case 23: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break; case 23: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 24: case 24:
DoScriptText(WHISPER_CUSTODIAN_14, me, pPlayer); DoScriptText(WHISPER_CUSTODIAN_14, me, player);
DoCast(pPlayer, 34883); DoCast(player, 34883);
// below here is temporary workaround, to be removed when spell works properly // below here is temporary workaround, to be removed when spell works properly
pPlayer->AreaExploredOrEventHappens(10277); player->AreaExploredOrEventHappens(10277);
break; break;
} }
} }
@@ -244,24 +244,24 @@ class npc_marin_noggenfogger : public CreatureScript
public: public:
npc_marin_noggenfogger() : CreatureScript("npc_marin_noggenfogger") { } npc_marin_noggenfogger() : CreatureScript("npc_marin_noggenfogger") { }
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) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->GetSession()->SendListInventory(creature->GetGUID()); player->GetSession()->SendListInventory(creature->GetGUID());
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetQuestRewardStatus(2662)) if (creature->isVendor() && player->GetQuestRewardStatus(2662))
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);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -279,35 +279,35 @@ class npc_steward_of_time : public CreatureScript
public: public:
npc_steward_of_time() : CreatureScript("npc_steward_of_time") { } npc_steward_of_time() : CreatureScript("npc_steward_of_time") { }
bool OnQuestAccept(Player* pPlayer, Creature* /*creature*/, Quest const *quest) bool OnQuestAccept(Player* player, Creature* /*creature*/, Quest const *quest)
{ {
if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair
pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns) player->CastSpell(player, 34891, true); //(Flight through Caverns)
return false; return false;
} }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns) player->CastSpell(player, 34891, true); //(Flight through Caverns)
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(10279) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestRewardStatus(10279)) if (player->GetQuestStatus(10279) == QUEST_STATUS_INCOMPLETE || player->GetQuestRewardStatus(10279))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(9978, creature->GetGUID()); player->SEND_GOSSIP_MENU(9978, creature->GetGUID());
} }
else else
pPlayer->SEND_GOSSIP_MENU(9977, creature->GetGUID()); player->SEND_GOSSIP_MENU(9977, creature->GetGUID());
return true; return true;
} }
@@ -330,48 +330,48 @@ class npc_stone_watcher_of_norgannon : public CreatureScript
public: public:
npc_stone_watcher_of_norgannon() : CreatureScript("npc_stone_watcher_of_norgannon") { } npc_stone_watcher_of_norgannon() : CreatureScript("npc_stone_watcher_of_norgannon") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(1675, creature->GetGUID()); player->SEND_GOSSIP_MENU(1675, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(1676, creature->GetGUID()); player->SEND_GOSSIP_MENU(1676, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(1677, creature->GetGUID()); player->SEND_GOSSIP_MENU(1677, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(1678, creature->GetGUID()); player->SEND_GOSSIP_MENU(1678, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(1679, creature->GetGUID()); player->SEND_GOSSIP_MENU(1679, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(2954); player->AreaExploredOrEventHappens(2954);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(1674, creature->GetGUID()); player->SEND_GOSSIP_MENU(1674, creature->GetGUID());
return true; return true;
} }
@@ -403,7 +403,7 @@ class npc_OOX17 : public CreatureScript
public: public:
npc_OOX17() : CreatureScript("npc_OOX17") { } npc_OOX17() : CreatureScript("npc_OOX17") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == Q_OOX17) if (quest->GetQuestId() == Q_OOX17)
{ {
@@ -414,7 +414,7 @@ public:
DoScriptText(SAY_OOX_START, creature); DoScriptText(SAY_OOX_START, creature);
if (npc_escortAI* pEscortAI = CAST_AI(npc_OOX17::npc_OOX17AI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_OOX17::npc_OOX17AI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
} }
return true; return true;
} }
@@ -430,9 +430,9 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(i) { switch(i) {
@@ -453,10 +453,10 @@ public:
break; break;
case 86: case 86:
if (pPlayer) if (player)
{ {
DoScriptText(SAY_OOX_END, me); DoScriptText(SAY_OOX_END, me);
pPlayer->GroupEventHappens(Q_OOX17, me); player->GroupEventHappens(Q_OOX17, me);
} }
break; break;
} }
@@ -506,12 +506,12 @@ class npc_tooga : public CreatureScript
public: public:
npc_tooga() : CreatureScript("npc_tooga") { } npc_tooga() : CreatureScript("npc_tooga") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_TOOGA) if (pQuest->GetQuestId() == QUEST_TOOGA)
{ {
if (npc_toogaAI* pToogaAI = CAST_AI(npc_tooga::npc_toogaAI, creature->AI())) if (npc_toogaAI* pToogaAI = CAST_AI(npc_tooga::npc_toogaAI, creature->AI()))
pToogaAI->StartFollow(pPlayer, FACTION_TOOG_ESCORTEE, pQuest); pToogaAI->StartFollow(player, FACTION_TOOG_ESCORTEE, pQuest);
} }
return true; return true;
@@ -549,10 +549,10 @@ public:
{ {
if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE)) if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
{ {
if (Player* pPlayer = GetLeaderForFollower()) if (Player* player = GetLeaderForFollower())
{ {
if (pPlayer->GetQuestStatus(QUEST_TOOGA) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_TOOGA) == QUEST_STATUS_INCOMPLETE)
pPlayer->GroupEventHappens(QUEST_TOOGA, me); player->GroupEventHappens(QUEST_TOOGA, me);
} }
TortaGUID = pWho->GetGUID(); TortaGUID = pWho->GetGUID();
src/server/scripts/Kalimdor/teldrassil.cpp
+5 -5
View File
@@ -48,12 +48,12 @@ class npc_mist : public CreatureScript
public: public:
npc_mist() : CreatureScript("npc_mist") { } npc_mist() : CreatureScript("npc_mist") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* pQuest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_MIST) if (pQuest->GetQuestId() == QUEST_MIST)
{ {
if (npc_mistAI* pMistAI = CAST_AI(npc_mist::npc_mistAI, creature->AI())) if (npc_mistAI* pMistAI = CAST_AI(npc_mist::npc_mistAI, creature->AI()))
pMistAI->StartFollow(pPlayer, FACTION_DARNASSUS, pQuest); pMistAI->StartFollow(player, FACTION_DARNASSUS, pQuest);
} }
return true; return true;
@@ -88,10 +88,10 @@ public:
{ {
DoScriptText(EMOTE_AT_HOME, me); DoScriptText(EMOTE_AT_HOME, me);
if (Player* pPlayer = GetLeaderForFollower()) if (Player* player = GetLeaderForFollower())
{ {
if (pPlayer->GetQuestStatus(QUEST_MIST) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_MIST) == QUEST_STATUS_INCOMPLETE)
pPlayer->GroupEventHappens(QUEST_MIST, me); player->GroupEventHappens(QUEST_MIST, me);
} }
//The follow is over (and for later development, run off to the woods before really end) //The follow is over (and for later development, run off to the woods before really end)
src/server/scripts/Kalimdor/the_barrens.cpp
+40 -40
View File
@@ -51,23 +51,23 @@ class npc_beaten_corpse : public CreatureScript
public: public:
npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { } npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF +1)
{ {
pPlayer->SEND_GOSSIP_MENU(3558, creature->GetGUID()); player->SEND_GOSSIP_MENU(3558, creature->GetGUID());
pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE) if (player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(3557, creature->GetGUID()); player->SEND_GOSSIP_MENU(3557, creature->GetGUID());
return true; return true;
} }
@@ -101,17 +101,17 @@ class npc_gilthares : public CreatureScript
public: public:
npc_gilthares() : CreatureScript("npc_gilthares") { } npc_gilthares() : CreatureScript("npc_gilthares") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_FREE_FROM_HOLD) if (pQuest->GetQuestId() == QUEST_FREE_FROM_HOLD)
{ {
creature->setFaction(FACTION_ESCORTEE); creature->setFaction(FACTION_ESCORTEE);
creature->SetStandState(UNIT_STAND_STATE_STAND); creature->SetStandState(UNIT_STAND_STATE_STAND);
DoScriptText(SAY_GIL_START, creature, pPlayer); DoScriptText(SAY_GIL_START, creature, player);
if (npc_giltharesAI* pEscortAI = CAST_AI(npc_gilthares::npc_giltharesAI, creature->AI())) if (npc_giltharesAI* pEscortAI = CAST_AI(npc_gilthares::npc_giltharesAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); pEscortAI->Start(false, false, player->GetGUID(), pQuest);
} }
return true; return true;
} }
@@ -129,31 +129,31 @@ public:
void WaypointReached(uint32 uiPointId) void WaypointReached(uint32 uiPointId)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(uiPointId) switch(uiPointId)
{ {
case 16: case 16:
DoScriptText(SAY_GIL_AT_LAST, me, pPlayer); DoScriptText(SAY_GIL_AT_LAST, me, player);
break; break;
case 17: case 17:
DoScriptText(SAY_GIL_PROCEED, me, pPlayer); DoScriptText(SAY_GIL_PROCEED, me, player);
break; break;
case 18: case 18:
DoScriptText(SAY_GIL_FREEBOOTERS, me, pPlayer); DoScriptText(SAY_GIL_FREEBOOTERS, me, player);
break; break;
case 37: case 37:
DoScriptText(SAY_GIL_ALMOST, me, pPlayer); DoScriptText(SAY_GIL_ALMOST, me, player);
break; break;
case 47: case 47:
DoScriptText(SAY_GIL_SWEET, me, pPlayer); DoScriptText(SAY_GIL_SWEET, me, player);
break; break;
case 53: case 53:
DoScriptText(SAY_GIL_FREED, me, pPlayer); DoScriptText(SAY_GIL_FREED, me, player);
pPlayer->GroupEventHappens(QUEST_FREE_FROM_HOLD, me); player->GroupEventHappens(QUEST_FREE_FROM_HOLD, me);
break; break;
} }
} }
@@ -186,26 +186,26 @@ class npc_sputtervalve : public CreatureScript
public: public:
npc_sputtervalve() : CreatureScript("npc_sputtervalve") { } npc_sputtervalve() : CreatureScript("npc_sputtervalve") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF)
{ {
pPlayer->SEND_GOSSIP_MENU(2013, creature->GetGUID()); player->SEND_GOSSIP_MENU(2013, creature->GetGUID());
pPlayer->AreaExploredOrEventHappens(6981); player->AreaExploredOrEventHappens(6981);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -295,7 +295,7 @@ public:
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void ReceiveEmote(Player* /*pPlayer*/, uint32 emote) void ReceiveEmote(Player* /*player*/, uint32 emote)
{ {
if (emote == TEXT_EMOTE_SALUTE) if (emote == TEXT_EMOTE_SALUTE)
{ {
@@ -592,9 +592,9 @@ public:
void WaypointReached(uint32 uiPointId) void WaypointReached(uint32 uiPointId)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(uiPointId) switch(uiPointId)
@@ -620,18 +620,18 @@ public:
void WaypointStart(uint32 uiPointId) void WaypointStart(uint32 uiPointId)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch(uiPointId) switch(uiPointId)
{ {
case 9: case 9:
DoScriptText(SAY_STARTUP2, me, pPlayer); DoScriptText(SAY_STARTUP2, me, player);
break; break;
case 18: case 18:
DoScriptText(SAY_PROGRESS_1, me, pPlayer); DoScriptText(SAY_PROGRESS_1, me, player);
SetRun(); SetRun();
break; break;
} }
@@ -666,9 +666,9 @@ public:
DoScriptText(SAY_END, me); DoScriptText(SAY_END, me);
break; break;
case 3: case 3:
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
{ {
pPlayer->GroupEventHappens(QUEST_ESCAPE, me); player->GroupEventHappens(QUEST_ESCAPE, me);
me->SummonCreature(NPC_PILOT_WIZZ, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000); me->SummonCreature(NPC_PILOT_WIZZ, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
} }
break; break;
@@ -688,13 +688,13 @@ public:
} }
}; };
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_ESCAPE) if (quest->GetQuestId() == QUEST_ESCAPE)
{ {
creature->setFaction(FACTION_RATCHET); creature->setFaction(FACTION_RATCHET);
if (npc_escortAI* pEscortAI = CAST_AI(npc_wizzlecrank_shredder::npc_wizzlecrank_shredderAI, creature->AI())) if (npc_escortAI* pEscortAI = CAST_AI(npc_wizzlecrank_shredder::npc_wizzlecrank_shredderAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID()); pEscortAI->Start(true, false, player->GetGUID());
} }
return true; return true;
} }
src/server/scripts/Kalimdor/thousand_needles.cpp
+27 -27
View File
@@ -54,12 +54,12 @@ class npc_kanati : public CreatureScript
public: public:
npc_kanati() : CreatureScript("npc_kanati") { } npc_kanati() : CreatureScript("npc_kanati") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_PROTECT_KANATI) if (pQuest->GetQuestId() == QUEST_PROTECT_KANATI)
{ {
if (npc_kanatiAI* pEscortAI = CAST_AI(npc_kanati::npc_kanatiAI, creature->AI())) if (npc_kanatiAI* pEscortAI = CAST_AI(npc_kanati::npc_kanatiAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest, true); pEscortAI->Start(false, false, player->GetGUID(), pQuest, true);
} }
return true; return true;
} }
@@ -84,8 +84,8 @@ public:
DoSpawnGalak(); DoSpawnGalak();
break; break;
case 1: case 1:
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
pPlayer->GroupEventHappens(QUEST_PROTECT_KANATI, me); player->GroupEventHappens(QUEST_PROTECT_KANATI, me);
break; break;
} }
} }
@@ -142,15 +142,15 @@ class npc_lakota_windsong : public CreatureScript
public: public:
npc_lakota_windsong() : CreatureScript("npc_lakota_windsong") { } npc_lakota_windsong() : CreatureScript("npc_lakota_windsong") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_FREE_AT_LAST) if (pQuest->GetQuestId() == QUEST_FREE_AT_LAST)
{ {
DoScriptText(SAY_LAKO_START, creature, pPlayer); DoScriptText(SAY_LAKO_START, creature, player);
creature->setFaction(FACTION_ESCORTEE_LAKO); creature->setFaction(FACTION_ESCORTEE_LAKO);
if (npc_lakota_windsongAI* pEscortAI = CAST_AI(npc_lakota_windsong::npc_lakota_windsongAI, creature->AI())) if (npc_lakota_windsongAI* pEscortAI = CAST_AI(npc_lakota_windsong::npc_lakota_windsongAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); pEscortAI->Start(false, false, player->GetGUID(), pQuest);
} }
return true; return true;
} }
@@ -183,8 +183,8 @@ public:
DoSpawnBandits(ID_AMBUSH_3); DoSpawnBandits(ID_AMBUSH_3);
break; break;
case 45: case 45:
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
pPlayer->GroupEventHappens(QUEST_FREE_AT_LAST, me); player->GroupEventHappens(QUEST_FREE_AT_LAST, me);
break; break;
} }
} }
@@ -227,15 +227,15 @@ class npc_paoka_swiftmountain : public CreatureScript
public: public:
npc_paoka_swiftmountain() : CreatureScript("npc_paoka_swiftmountain") { } npc_paoka_swiftmountain() : CreatureScript("npc_paoka_swiftmountain") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_HOMEWARD) if (pQuest->GetQuestId() == QUEST_HOMEWARD)
{ {
DoScriptText(SAY_START, creature, pPlayer); DoScriptText(SAY_START, creature, player);
creature->setFaction(FACTION_ESCORTEE); creature->setFaction(FACTION_ESCORTEE);
if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, creature->AI())) if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); pEscortAI->Start(false, false, player->GetGUID(), pQuest);
} }
return true; return true;
} }
@@ -263,8 +263,8 @@ public:
DoScriptText(SAY_COMPLETE, me); DoScriptText(SAY_COMPLETE, me);
break; break;
case 27: case 27:
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
pPlayer->GroupEventHappens(QUEST_HOMEWARD, me); player->GroupEventHappens(QUEST_HOMEWARD, me);
break; break;
} }
} }
@@ -299,24 +299,24 @@ class npc_plucky : public CreatureScript
public: public:
npc_plucky() : CreatureScript("npc_plucky") { } npc_plucky() : CreatureScript("npc_plucky") { }
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) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->CompleteQuest(QUEST_SCOOP); player->CompleteQuest(QUEST_SCOOP);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(738, creature->GetGUID()); player->SEND_GOSSIP_MENU(738, creature->GetGUID());
return true; return true;
} }
@@ -346,9 +346,9 @@ public:
DoCast(me, SPELL_PLUCKY_CHICKEN, false); DoCast(me, SPELL_PLUCKY_CHICKEN, false);
} }
void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) void ReceiveEmote(Player* player, uint32 uiTextEmote)
{ {
if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
{ {
if (uiTextEmote == TEXT_EMOTE_BECKON) if (uiTextEmote == TEXT_EMOTE_BECKON)
{ {
@@ -408,16 +408,16 @@ class go_panther_cage : public GameObjectScript
public: public:
go_panther_cage() : GameObjectScript("go_panther_cage") { } go_panther_cage() : GameObjectScript("go_panther_cage") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo) bool OnGossipHello(Player* player, GameObject* pGo)
{ {
if (pPlayer->GetQuestStatus(5151) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(5151) == QUEST_STATUS_INCOMPLETE)
{ {
if (Creature* panther = pGo->FindNearestCreature(ENRAGED_PANTHER, 5, true)) if (Creature* panther = pGo->FindNearestCreature(ENRAGED_PANTHER, 5, true))
{ {
panther->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); panther->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
panther->SetReactState(REACT_AGGRESSIVE); panther->SetReactState(REACT_AGGRESSIVE);
panther->AI()->AttackStart(pPlayer); panther->AI()->AttackStart(player);
} }
} }
src/server/scripts/Kalimdor/thunder_bluff.cpp
+9 -9
View File
@@ -42,26 +42,26 @@ class npc_cairne_bloodhoof : public CreatureScript
public: public:
npc_cairne_bloodhoof() : CreatureScript("npc_cairne_bloodhoof") { } npc_cairne_bloodhoof() : CreatureScript("npc_cairne_bloodhoof") { }
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_SENDER_INFO) if (uiAction == GOSSIP_SENDER_INFO)
{ {
pPlayer->CastSpell(pPlayer, 23123, false); player->CastSpell(player, 23123, false);
pPlayer->SEND_GOSSIP_MENU(7014, creature->GetGUID()); player->SEND_GOSSIP_MENU(7014, creature->GetGUID());
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(925) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(925) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HCB, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HCB, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
pPlayer->SEND_GOSSIP_MENU(7013, creature->GetGUID()); player->SEND_GOSSIP_MENU(7013, creature->GetGUID());
return true; return true;
} }
src/server/scripts/Kalimdor/ungoro_crater.cpp
+19 -19
View File
@@ -54,12 +54,12 @@ class npc_ame : public CreatureScript
public: public:
npc_ame() : CreatureScript("npc_ame") { } npc_ame() : CreatureScript("npc_ame") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, Quest const* quest) bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_CHASING_AME) if (quest->GetQuestId() == QUEST_CHASING_AME)
{ {
CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID());
DoScriptText(SAY_READY, creature, pPlayer); DoScriptText(SAY_READY, creature, player);
creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
// Change faction so mobs attack // Change faction so mobs attack
creature->setFaction(113); creature->setFaction(113);
@@ -80,32 +80,32 @@ public:
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (!pPlayer) if (!player)
return; return;
switch (i) switch (i)
{ {
case 19: case 19:
me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO1, me, pPlayer); DoScriptText(SAY_AGGRO1, me, player);
break; break;
case 28: case 28:
DoScriptText(SAY_SEARCH, me, pPlayer); DoScriptText(SAY_SEARCH, me, player);
break; break;
case 38: case 38:
me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO2, me, pPlayer); DoScriptText(SAY_AGGRO2, me, player);
break; break;
case 49: case 49:
me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
DoScriptText(SAY_AGGRO3, me, pPlayer); DoScriptText(SAY_AGGRO3, me, player);
break; break;
case 55: case 55:
DoScriptText(SAY_FINISH, me, pPlayer); DoScriptText(SAY_FINISH, me, player);
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_CHASING_AME, me); player->GroupEventHappens(QUEST_CHASING_AME, me);
break; break;
} }
} }
@@ -122,8 +122,8 @@ public:
void JustDied(Unit* /*killer*/) void JustDied(Unit* /*killer*/)
{ {
if (Player* pPlayer = GetPlayerForEscort()) if (Player* player = GetPlayerForEscort())
pPlayer->FailQuest(QUEST_CHASING_AME); player->FailQuest(QUEST_CHASING_AME);
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
@@ -180,14 +180,14 @@ class npc_ringo : public CreatureScript
public: public:
npc_ringo() : CreatureScript("npc_ringo") { } npc_ringo() : CreatureScript("npc_ringo") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest) bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{ {
if (pQuest->GetQuestId() == QUEST_A_LITTLE_HELP) if (pQuest->GetQuestId() == QUEST_A_LITTLE_HELP)
{ {
if (npc_ringoAI* pRingoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI())) if (npc_ringoAI* pRingoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI()))
{ {
creature->SetStandState(UNIT_STAND_STATE_STAND); creature->SetStandState(UNIT_STAND_STATE_STAND);
pRingoAI->StartFollow(pPlayer, FACTION_ESCORTEE, pQuest); pRingoAI->StartFollow(player, FACTION_ESCORTEE, pQuest);
} }
} }
@@ -225,10 +225,10 @@ public:
{ {
if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE)) if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
{ {
if (Player* pPlayer = GetLeaderForFollower()) if (Player* player = GetLeaderForFollower())
{ {
if (pPlayer->GetQuestStatus(QUEST_A_LITTLE_HELP) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(QUEST_A_LITTLE_HELP) == QUEST_STATUS_INCOMPLETE)
pPlayer->GroupEventHappens(QUEST_A_LITTLE_HELP, me); player->GroupEventHappens(QUEST_A_LITTLE_HELP, me);
} }
SpraggleGUID = pWho->GetGUID(); SpraggleGUID = pWho->GetGUID();
src/server/scripts/Kalimdor/winterspring.cpp
+37 -37
View File
@@ -48,48 +48,48 @@ class npc_lorax : public CreatureScript
public: public:
npc_lorax() : CreatureScript("npc_lorax") { } npc_lorax() : CreatureScript("npc_lorax") { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(3759, creature->GetGUID()); player->SEND_GOSSIP_MENU(3759, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(3760, creature->GetGUID()); player->SEND_GOSSIP_MENU(3760, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(3761, creature->GetGUID()); player->SEND_GOSSIP_MENU(3761, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(3762, creature->GetGUID()); player->SEND_GOSSIP_MENU(3762, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
pPlayer->SEND_GOSSIP_MENU(3763, creature->GetGUID()); player->SEND_GOSSIP_MENU(3763, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(5126); player->AreaExploredOrEventHappens(5126);
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE) if (player->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -105,24 +105,24 @@ class npc_rivern_frostwind : public CreatureScript
public: public:
npc_rivern_frostwind() : CreatureScript("npc_rivern_frostwind") { } npc_rivern_frostwind() : CreatureScript("npc_rivern_frostwind") { }
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) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->GetSession()->SendListInventory(creature->GetGUID()); player->GetSession()->SendListInventory(creature->GetGUID());
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetReputationRank(589) == REP_EXALTED) if (creature->isVendor() && player->GetReputationRank(589) == REP_EXALTED)
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);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
@@ -140,29 +140,29 @@ class npc_witch_doctor_mauari : public CreatureScript
public: public:
npc_witch_doctor_mauari() : CreatureScript("npc_witch_doctor_mauari") { } npc_witch_doctor_mauari() : CreatureScript("npc_witch_doctor_mauari") { }
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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 16351, false); creature->CastSpell(player, 16351, false);
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestRewardStatus(975)) if (player->GetQuestRewardStatus(975))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(3377, creature->GetGUID()); player->SEND_GOSSIP_MENU(3377, creature->GetGUID());
}else }else
pPlayer->SEND_GOSSIP_MENU(3375, creature->GetGUID()); player->SEND_GOSSIP_MENU(3375, creature->GetGUID());
return true; return true;
} }
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+6 -6
View File
@@ -144,8 +144,8 @@ public:
Map::PlayerList const &players = me->GetMap()->GetPlayers(); Map::PlayerList const &players = me->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
{ {
Player* pPlayer = i->getSource(); Player* player = i->getSource();
pPlayer->RemoveAurasDueToSpell(GetSpellForPhaseMask(pPlayer->GetPhaseMask())); player->RemoveAurasDueToSpell(GetSpellForPhaseMask(player->GetPhaseMask()));
} }
} }
@@ -244,13 +244,13 @@ public:
{ {
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{ {
if (Player* pPlayer = i->getSource()) if (Player* player = i->getSource())
{ {
if (pPlayer->HasAura(spell)) if (player->HasAura(spell))
{ {
pPlayer->RemoveAurasDueToSpell(spell); player->RemoveAurasDueToSpell(spell);
if (spell2) // if there is still some different mask cast spell for it if (spell2) // if there is still some different mask cast spell for it
pPlayer->CastSpell(pPlayer, spell2, true); player->CastSpell(player, spell2, true);
} }
} }
} }
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+1 -1
View File
@@ -386,7 +386,7 @@ class prince_taldaram_sphere : public GameObjectScript
public: public:
prince_taldaram_sphere() : GameObjectScript("prince_taldaram_sphere") { } prince_taldaram_sphere() : GameObjectScript("prince_taldaram_sphere") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{ {
InstanceScript *pInstance = pGO->GetInstanceScript(); InstanceScript *pInstance = pGO->GetInstanceScript();
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+19 -19
View File
@@ -100,18 +100,18 @@ void AggroAllPlayers(Creature* pTemp)
for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
{ {
if (Player* pPlayer = i->getSource()) if (Player* player = i->getSource())
{ {
if (pPlayer->isGameMaster()) if (player->isGameMaster())
continue; continue;
if (pPlayer->isAlive()) if (player->isAlive())
{ {
pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
pTemp->SetReactState(REACT_AGGRESSIVE); pTemp->SetReactState(REACT_AGGRESSIVE);
pTemp->SetInCombatWith(pPlayer); pTemp->SetInCombatWith(player);
pPlayer->SetInCombatWith(pTemp); player->SetInCombatWith(pTemp);
pTemp->AddThreat(pPlayer, 0.0f); pTemp->AddThreat(player, 0.0f);
} }
} }
} }
@@ -251,12 +251,12 @@ public:
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
Player* pPlayer = itr->getSource(); Player* player = itr->getSource();
if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 8.0f, 25.0f, false)) if (player && !player->isGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false))
{ {
DoResetThreat(); DoResetThreat();
me->AddThreat(pPlayer, 1.0f); me->AddThreat(player, 1.0f);
DoCast(pPlayer, SPELL_CHARGE); DoCast(player, SPELL_CHARGE);
break; break;
} }
} }
@@ -278,10 +278,10 @@ public:
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
Player* pPlayer = itr->getSource(); Player* player = itr->getSource();
if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 10.0f, 30.0f, false)) if (player && !player->isGameMaster() && me->IsInRange(player, 10.0f, 30.0f, false))
{ {
pPassenger->CastSpell(pPlayer, SPELL_SHIELD_BREAKER, true); pPassenger->CastSpell(player, SPELL_SHIELD_BREAKER, true);
break; break;
} }
} }
@@ -392,12 +392,12 @@ public:
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
Player* pPlayer = itr->getSource(); Player* player = itr->getSource();
if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 8.0f, 25.0f, false)) if (player && !player->isGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false))
{ {
DoResetThreat(); DoResetThreat();
me->AddThreat(pPlayer, 5.0f); me->AddThreat(player, 5.0f);
DoCast(pPlayer, SPELL_INTERCEPT); DoCast(player, SPELL_INTERCEPT);
break; break;
} }
} }
@@ -846,8 +846,8 @@ public:
{ {
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
Player* pPlayer = itr->getSource(); Player* player = itr->getSource();
if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 5.0f, 30.0f, false)) if (player && !player->isGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false))
{ {
DoCast(pTarget, SPELL_MULTI_SHOT); DoCast(pTarget, SPELL_MULTI_SHOT);
break; break;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+2 -2
View File
@@ -105,8 +105,8 @@ public:
if (!players.isEmpty()) if (!players.isEmpty())
{ {
if (Player* pPlayer = players.begin()->getSource()) if (Player* player = players.begin()->getSource())
TeamInInstance = pPlayer->GetTeam(); TeamInInstance = player->GetTeam();
} }
switch(creature->GetEntry()) switch(creature->GetEntry())
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+13 -13
View File
@@ -382,19 +382,19 @@ public:
for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
{ {
if (Player* pPlayer = i->getSource()) if (Player* player = i->getSource())
{ {
if (pPlayer->isGameMaster()) if (player->isGameMaster())
continue; continue;
if (pPlayer->isAlive()) if (player->isAlive())
{ {
pTemp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); pTemp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pTemp->SetReactState(REACT_AGGRESSIVE); pTemp->SetReactState(REACT_AGGRESSIVE);
pTemp->SetInCombatWith(pPlayer); pTemp->SetInCombatWith(player);
pPlayer->SetInCombatWith(pTemp); player->SetInCombatWith(pTemp);
pTemp->AddThreat(pPlayer, 0.0f); pTemp->AddThreat(player, 0.0f);
} }
} }
} }
@@ -466,7 +466,7 @@ public:
return new npc_announcer_toc5AI(creature); return new npc_announcer_toc5AI(creature);
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
@@ -482,21 +482,21 @@ public:
pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED &&
pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED &&
pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
else if (pInstance) else if (pInstance)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, 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; 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) if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_announcer_toc5::npc_announcer_toc5AI, creature->AI())->StartEncounter(); CAST_AI(npc_announcer_toc5::npc_announcer_toc5AI, creature->AI())->StartEncounter();
} }
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+2 -2
View File
@@ -348,8 +348,8 @@ struct boss_faction_championsAI : public ScriptedAI
uint32 TeamInInstance = 0; uint32 TeamInInstance = 0;
if (!players.isEmpty()) if (!players.isEmpty())
if (Player* pPlayer = players.begin()->getSource()) if (Player* player = players.begin()->getSource())
TeamInInstance = pPlayer->GetTeam(); TeamInInstance = player->GetTeam();
if (m_pInstance) if (m_pInstance)
{ {
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+2 -2
View File
@@ -875,8 +875,8 @@ public:
Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers(); Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
{ {
if (Unit* pPlayer = itr->getSource()) if (Unit* player = itr->getSource())
if (pPlayer->isAlive() && pPlayer->IsWithinDistInMap(me, 6.0f)) if (player->isAlive() && player->IsWithinDistInMap(me, 6.0f))
{ {
DoCastAOE(SPELL_TRAMPLE); DoCastAOE(SPELL_TRAMPLE);
m_uiTrampleTimer = IN_MILLISECONDS; m_uiTrampleTimer = IN_MILLISECONDS;
src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+2 -2
View File
@@ -235,8 +235,8 @@ public:
Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers(); Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* pPlayer = i->getSource()) if (Player* player = i->getSource())
pPlayer->DeMorph(); player->DeMorph();
pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK); pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK);
pInstance->SetData(DATA_THARON_JA_EVENT, DONE); pInstance->SetData(DATA_THARON_JA_EVENT, DONE);
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+11 -11
View File
@@ -157,19 +157,19 @@ private:
public: public:
npc_jaina_or_sylvanas_hor(bool isSylvana, const char* name) : CreatureScript(name), m_isSylvana(isSylvana) { } npc_jaina_or_sylvanas_hor(bool isSylvana, const char* name) : CreatureScript(name), m_isSylvana(isSylvana) { }
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) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (creature->AI()) if (creature->AI())
creature->AI()->DoAction(ACTION_START_INTRO); creature->AI()->DoAction(ACTION_START_INTRO);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
if (creature->AI()) if (creature->AI())
creature->AI()->DoAction(ACTION_SKIP_INTRO); creature->AI()->DoAction(ACTION_SKIP_INTRO);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -179,21 +179,21 @@ public:
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
QuestStatus status = pPlayer->GetQuestStatus(m_isSylvana ? QUEST_DELIVRANCE_FROM_THE_PIT_H2 : QUEST_DELIVRANCE_FROM_THE_PIT_A2); QuestStatus status = player->GetQuestStatus(m_isSylvana ? QUEST_DELIVRANCE_FROM_THE_PIT_H2 : QUEST_DELIVRANCE_FROM_THE_PIT_A2);
if (status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) if (status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED)
pPlayer->ADD_GOSSIP_ITEM( 0, "Can you remove the sword?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM( 0, "Can you remove the sword?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
// once last quest is completed, she offers this shortcut of the starting event // once last quest is completed, she offers this shortcut of the starting event
status = pPlayer->GetQuestStatus(m_isSylvana ? QUEST_WRATH_OF_THE_LICH_KING_H2 : QUEST_WRATH_OF_THE_LICH_KING_A2); status = player->GetQuestStatus(m_isSylvana ? QUEST_WRATH_OF_THE_LICH_KING_H2 : QUEST_WRATH_OF_THE_LICH_KING_A2);
if (status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) if (status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED)
pPlayer->ADD_GOSSIP_ITEM( 0, "Dark Lady, I think I hear Arthas coming. Whatever you're going to do, do it quickly.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM( 0, "Dark Lady, I think I hear Arthas coming. Whatever you're going to do, do it quickly.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, creature->GetGUID()); player->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, creature->GetGUID());
return true; return true;
} }
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+2 -2
View File
@@ -154,8 +154,8 @@ public:
{ {
Map::PlayerList const &players = instance->GetPlayers(); Map::PlayerList const &players = instance->GetPlayers();
if (!players.isEmpty()) if (!players.isEmpty())
if (Player* pPlayer = players.begin()->getSource()) if (Player* player = players.begin()->getSource())
uiTeamInInstance = pPlayer->GetTeam(); uiTeamInInstance = player->GetTeam();
switch(creature->GetEntry()) switch(creature->GetEntry())
{ {
src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+1 -1
View File
@@ -519,7 +519,7 @@ class go_gundrak_altar : public GameObjectScript
public: public:
go_gundrak_altar() : GameObjectScript("go_gundrak_altar") { } go_gundrak_altar() : GameObjectScript("go_gundrak_altar") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{ {
InstanceScript *pInstance = pGO->GetInstanceScript(); InstanceScript *pInstance = pGO->GetInstanceScript();
uint64 uiStatue = 0; uint64 uiStatue = 0;
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+7 -7
View File
@@ -338,8 +338,8 @@ public:
std::map<uint64, float>::const_iterator itr; std::map<uint64, float>::const_iterator itr;
for (itr = chained.begin(); itr != chained.end(); ++itr) for (itr = chained.begin(); itr != chained.end(); ++itr)
{ {
if (Player* pPlayer = Unit::GetPlayer(*me, (*itr).first)) if (Player* player = Unit::GetPlayer(*me, (*itr).first))
pPlayer->SetFloatValue(OBJECT_FIELD_SCALE_X, (*itr).second); player->SetFloatValue(OBJECT_FIELD_SCALE_X, (*itr).second);
} }
chained.clear(); chained.clear();
} }
@@ -650,16 +650,16 @@ class at_kelthuzad_center : public AreaTriggerScript
public: public:
at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { } at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { }
bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) bool OnTrigger(Player* player, const AreaTriggerEntry * /*at*/)
{ {
if (pPlayer->isGameMaster()) if (player->isGameMaster())
return false; return false;
InstanceScript* pInstance = pPlayer->GetInstanceScript(); InstanceScript* pInstance = player->GetInstanceScript();
if (!pInstance || pInstance->IsEncounterInProgress() || pInstance->GetBossState(BOSS_KELTHUZAD) == DONE) if (!pInstance || pInstance->IsEncounterInProgress() || pInstance->GetBossState(BOSS_KELTHUZAD) == DONE)
return false; return false;
Creature* pKelthuzad = CAST_CRE(Unit::GetUnit(*pPlayer, pInstance->GetData64(DATA_KELTHUZAD))); Creature* pKelthuzad = CAST_CRE(Unit::GetUnit(*player, pInstance->GetData64(DATA_KELTHUZAD)));
if (!pKelthuzad) if (!pKelthuzad)
return false; return false;
@@ -667,7 +667,7 @@ public:
if (!pKelthuzadAI) if (!pKelthuzadAI)
return false; return false;
pKelthuzadAI->AttackStart(pPlayer); pKelthuzadAI->AttackStart(player);
if (GameObject* trigger = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_KELTHUZAD_TRIGGER))) if (GameObject* trigger = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_KELTHUZAD_TRIGGER)))
{ {
if (trigger->getLootState() == GO_READY) if (trigger->getLootState() == GO_READY)
src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+2 -2
View File
@@ -213,8 +213,8 @@ public:
{ {
for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
{ {
if (Player* pPlayer = Unit::GetPlayer(*me, itr->first)) if (Player* player = Unit::GetPlayer(*me, itr->first))
pPlayer->RemoveAura(SPELL_ICEBOLT); player->RemoveAura(SPELL_ICEBOLT);
if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second)) if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second))
pGo->Delete(); pGo->Delete();
} }
src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ class containment_sphere : public GameObjectScript
public: public:
containment_sphere() : GameObjectScript("containment_sphere") { } containment_sphere() : GameObjectScript("containment_sphere") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{ {
InstanceScript *pInstance = pGO->GetInstanceScript(); InstanceScript *pInstance = pGO->GetInstanceScript();
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+2 -2
View File
@@ -66,8 +66,8 @@ public:
if (!players.isEmpty()) if (!players.isEmpty())
{ {
if (Player* pPlayer = players.begin()->getSource()) if (Player* player = players.begin()->getSource())
TeamInInstance = pPlayer->GetTeam(); TeamInInstance = player->GetTeam();
} }
switch (creature->GetEntry()) switch (creature->GetEntry())
{ {
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+32 -32
View File
@@ -55,38 +55,38 @@ class npc_oculus_drake : public CreatureScript
public: public:
npc_oculus_drake() : CreatureScript("npc_oculus_drake") { } npc_oculus_drake() : CreatureScript("npc_oculus_drake") { }
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(creature->GetEntry()) switch(creature->GetEntry())
{ {
case NPC_VERDISA: //Verdisa case NPC_VERDISA: //Verdisa
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
if (!HAS_ESSENCE(pPlayer)) if (!HAS_ESSENCE(player))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA1, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA1, creature->GetGUID());
} }
else else
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA2, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA2, creature->GetGUID());
} }
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_EMERALD_ESSENCE, 1); uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_EMERALD_ESSENCE, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
pPlayer->StoreNewItem(dest, ITEM_EMERALD_ESSENCE, true); player->StoreNewItem(dest, ITEM_EMERALD_ESSENCE, true);
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
break; break;
} }
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA3, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA3, creature->GetGUID());
break; break;
} }
break; break;
@@ -94,29 +94,29 @@ public:
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
if (!HAS_ESSENCE(pPlayer)) if (!HAS_ESSENCE(player))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ1, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ1, creature->GetGUID());
} }
else else
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ2, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ2, creature->GetGUID());
} }
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_RUBY_ESSENCE, 1); uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_RUBY_ESSENCE, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
pPlayer->StoreNewItem(dest, ITEM_RUBY_ESSENCE, true); player->StoreNewItem(dest, ITEM_RUBY_ESSENCE, true);
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
break; break;
} }
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ3, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ3, creature->GetGUID());
break; break;
} }
break; break;
@@ -124,29 +124,29 @@ public:
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
if (!HAS_ESSENCE(pPlayer)) if (!HAS_ESSENCE(player))
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS1, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS1, creature->GetGUID());
} }
else else
{ {
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS2, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS2, creature->GetGUID());
} }
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_AMBER_ESSENCE, 1); uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_AMBER_ESSENCE, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
pPlayer->StoreNewItem(dest, ITEM_AMBER_ESSENCE, true); player->StoreNewItem(dest, ITEM_AMBER_ESSENCE, true);
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
break; break;
} }
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS3, creature->GetGUID()); player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS3, creature->GetGUID());
break; break;
} }
break; break;
src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+10 -10
View File
@@ -268,25 +268,25 @@ class npc_brann_hos : public CreatureScript
public: public:
npc_brann_hos() : CreatureScript("npc_brann_hos") { } npc_brann_hos() : CreatureScript("npc_brann_hos") { }
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 || uiAction == GOSSIP_ACTION_INFO_DEF+2) if (uiAction == GOSSIP_ACTION_INFO_DEF+1 || uiAction == GOSSIP_ACTION_INFO_DEF+2)
{ {
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_brann_hos::npc_brann_hosAI, creature->AI())->StartWP(); CAST_AI(npc_brann_hos::npc_brann_hosAI, creature->AI())->StartWP();
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(TEXT_ID_START, creature->GetGUID()); player->SEND_GOSSIP_MENU(TEXT_ID_START, creature->GetGUID());
return true; return true;
} }
@@ -705,9 +705,9 @@ public:
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false);
} }
Player* pPlayer = GetPlayerForEscort(); Player* player = GetPlayerForEscort();
if (pPlayer) if (player)
pPlayer->GroupEventHappens(QUEST_HALLS_OF_STONE, me); player->GroupEventHappens(QUEST_HALLS_OF_STONE, me);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
JumpToNextStep(180000); JumpToNextStep(180000);
break; break;
src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+13 -13
View File
@@ -1210,38 +1210,38 @@ class npc_brann_bronzebeard : public CreatureScript
public: public:
npc_brann_bronzebeard() : CreatureScript("npc_brann_bronzebeard") { } npc_brann_bronzebeard() : CreatureScript("npc_brann_bronzebeard") { }
//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) // switch(uiAction)
// { // {
// case GOSSIP_ACTION_INFO_DEF+1: // case GOSSIP_ACTION_INFO_DEF+1:
// if (pPlayer) // if (player)
// { // {
// pPlayer->PrepareGossipMenu(creature); // player->PrepareGossipMenu(creature);
// //
// pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); // player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
// pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); // player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
// } // }
// break; // break;
// case GOSSIP_ACTION_INFO_DEF+2: // case GOSSIP_ACTION_INFO_DEF+2:
// if (pPlayer) // if (player)
// pPlayer->CLOSE_GOSSIP_MENU(); // player->CLOSE_GOSSIP_MENU();
// if (Creature* Lorekeeper = creature->FindNearestCreature(NPC_LOREKEEPER, 1000, true)) //lore keeper of lorgannon // if (Creature* Lorekeeper = creature->FindNearestCreature(NPC_LOREKEEPER, 1000, true)) //lore keeper of lorgannon
// Lorekeeper->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); // Lorekeeper->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
// break; // break;
// } // }
// return true; // return true;
//} //}
//bool OnGossipHello(Player* pPlayer, Creature* creature) //bool OnGossipHello(Player* player, Creature* creature)
//{ //{
// InstanceScript* instance = creature->GetInstanceScript(); // InstanceScript* instance = creature->GetInstanceScript();
// if (instance && instance->GetData(BOSS_LEVIATHAN) !=DONE) // if (instance && instance->GetData(BOSS_LEVIATHAN) !=DONE)
// { // {
// pPlayer->PrepareGossipMenu(creature); // player->PrepareGossipMenu(creature);
// //
// pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); // player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, 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; // return true;
//} //}
@@ -1254,7 +1254,7 @@ class go_ulduar_tower : public GameObjectScript
public: public:
go_ulduar_tower() : GameObjectScript("go_ulduar_tower") { } go_ulduar_tower() : GameObjectScript("go_ulduar_tower") { }
void OnDestroyed(GameObject* go, Player* /*pPlayer*/, uint32 /*value*/) void OnDestroyed(GameObject* go, Player* /*player*/, uint32 /*value*/)
{ {
InstanceScript* instance = go->GetInstanceScript(); InstanceScript* instance = go->GetInstanceScript();
if (!instance) if (!instance)
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+1 -1
View File
@@ -834,7 +834,7 @@ class go_palehoof_sphere : public GameObjectScript
public: public:
go_palehoof_sphere() : GameObjectScript("go_palehoof_sphere") { } go_palehoof_sphere() : GameObjectScript("go_palehoof_sphere") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{ {
InstanceScript *pInstance = pGO->GetInstanceScript(); InstanceScript *pInstance = pGO->GetInstanceScript();
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+2 -2
View File
@@ -461,14 +461,14 @@ class go_harpoon_launcher : public GameObjectScript
public: public:
go_harpoon_launcher() : GameObjectScript("go_harpoon_launcher") { } go_harpoon_launcher() : GameObjectScript("go_harpoon_launcher") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGO) bool OnGossipHello(Player* player, GameObject* pGO)
{ {
InstanceScript* m_pInstance = pGO->GetInstanceScript(); InstanceScript* m_pInstance = pGO->GetInstanceScript();
if (!m_pInstance) return false; if (!m_pInstance) return false;
if (Creature* pSkadi = Unit::GetCreature((*pGO), m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) if (Creature* pSkadi = Unit::GetCreature((*pGO), m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS)))
{ {
pPlayer->CastSpell(pSkadi, SPELL_RAPID_FIRE, true); player->CastSpell(pSkadi, SPELL_RAPID_FIRE, true);
} }
return false; return false;
} }
src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+3 -3
View File
@@ -666,11 +666,11 @@ public:
Map::PlayerList const &players = instance->GetPlayers(); Map::PlayerList const &players = instance->GetPlayers();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
Player* pPlayer = itr->getSource(); Player* player = itr->getSource();
if (pPlayer->isGameMaster()) if (player->isGameMaster())
continue; continue;
if (pPlayer->isAlive()) if (player->isAlive())
return false; return false;
} }
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+13 -13
View File
@@ -253,29 +253,29 @@ class npc_sinclari_vh : public CreatureScript
public: public:
npc_sinclari_vh() : CreatureScript("npc_sinclari_vh") { } npc_sinclari_vh() : CreatureScript("npc_sinclari_vh") { }
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) switch(uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_sinclari_vh::npc_sinclariAI, (creature->AI()))->uiPhase = 1; CAST_AI(npc_sinclari_vh::npc_sinclariAI, (creature->AI()))->uiPhase = 1;
if (InstanceScript *pInstance = creature->GetInstanceScript()) if (InstanceScript *pInstance = creature->GetInstanceScript())
pInstance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL); pInstance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL);
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->SEND_GOSSIP_MENU(13854, creature->GetGUID()); player->SEND_GOSSIP_MENU(13854, creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(), playerTeleportPosition.GetPositionY(), playerTeleportPosition.GetPositionZ(), playerTeleportPosition.GetOrientation(), true); player->NearTeleportTo(playerTeleportPosition.GetPositionX(), playerTeleportPosition.GetPositionY(), playerTeleportPosition.GetPositionZ(), playerTeleportPosition.GetOrientation(), true);
pPlayer->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
break; break;
} }
return true; return true;
} }
bool OnGossipHello(Player* pPlayer, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (InstanceScript* pInstance = creature->GetInstanceScript()) if (InstanceScript* pInstance = creature->GetInstanceScript())
{ {
@@ -283,16 +283,16 @@ public:
{ {
case NOT_STARTED: case NOT_STARTED:
case FAIL: // Allow to start event if not started or wiped case FAIL: // Allow to start event if not started or wiped
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(13853, creature->GetGUID()); player->SEND_GOSSIP_MENU(13853, creature->GetGUID());
break; break;
case IN_PROGRESS: // Allow to teleport inside if event is in progress case IN_PROGRESS: // Allow to teleport inside if event is in progress
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_I_WANT_IN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_I_WANT_IN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(13853, creature->GetGUID()); player->SEND_GOSSIP_MENU(13853, creature->GetGUID());
break; break;
default: default:
pPlayer->SEND_GOSSIP_MENU(13910, creature->GetGUID()); player->SEND_GOSSIP_MENU(13910, creature->GetGUID());
} }
} }
return true; return true;

Some files were not shown because too many files have changed in this diff Show More