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/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+17 -17
View File
@@ -37,10 +37,10 @@ class go_blackfathom_altar : public GameObjectScript
public:
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))
pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, pPlayer);
if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM))
player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player);
return true;
}
@@ -51,7 +51,7 @@ class go_blackfathom_fire : public GameObjectScript
public:
go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo)
bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{
InstanceScript *pInstance = pGo->GetInstanceScript();
@@ -116,16 +116,16 @@ public:
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;
if (pPlayer->isAlive())
if (player->isAlive())
{
me->SetInCombatWith(pPlayer);
pPlayer->SetInCombatWith(me);
me->AddThreat(pPlayer, 0.0f);
me->SetInCombatWith(player);
player->SetInCombatWith(me);
me->AddThreat(player, 0.0f);
}
}
}
@@ -201,24 +201,24 @@ class npc_morridune : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f);
pPlayer->CLOSE_GOSSIP_MENU();
player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f);
player->CLOSE_GOSSIP_MENU();
break;
}
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;
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+33 -33
View File
@@ -50,19 +50,19 @@ class npc_jaina_proudmoore : public CreatureScript
public:
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());
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF + 1:
ai->StartEvent(pPlayer);
ai->StartEvent(player);
break;
case GOSSIP_ACTION_INFO_DEF + 2:
ai->FirstBossDead = true;
ai->WaveCount = 9;
ai->StartEvent(pPlayer);
ai->StartEvent(player);
break;
case GOSSIP_ACTION_INFO_DEF + 3:
ai->Retreat();
@@ -75,7 +75,7 @@ public:
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
if (ai->EventBegun)
@@ -84,16 +84,16 @@ public:
uint32 RageEncounter = ai->GetInstanceData(DATA_RAGEWINTERCHILLEVENT);
uint32 AnetheronEncounter = ai->GetInstanceData(DATA_ANETHERONEVENT);
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)
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)
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())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (player->isGameMaster())
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;
}
@@ -126,20 +126,20 @@ class npc_thrall : public CreatureScript
public:
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());
ai->DeSpawnVeins();//despawn the alliance veins
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF + 1:
ai->StartEvent(pPlayer);
ai->StartEvent(player);
break;
case GOSSIP_ACTION_INFO_DEF + 2:
ai->FirstBossDead = true;
ai->WaveCount = 9;
ai->StartEvent(pPlayer);
ai->StartEvent(player);
break;
case GOSSIP_ACTION_INFO_DEF + 3:
ai->Retreat();
@@ -152,7 +152,7 @@ public:
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
if (ai->EventBegun)
@@ -165,17 +165,17 @@ public:
uint32 KazrogalEvent = ai->GetInstanceData(DATA_KAZROGALEVENT);
uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT);
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)
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)
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())
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (player->isGameMaster())
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;
}
@@ -212,34 +212,34 @@ public:
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)
{
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)
{
Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true);
if (item && pPlayer)
pPlayer->SendNewItem(item, 1, true, false, true);
Item* item = player->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true);
if (item && player)
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());
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT);
// Only let them get item if Azgalor is dead.
if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS, 1))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(907, creature->GetGUID());
if (AzgalorEvent == DONE && !player->HasItemCount(ITEM_TEAR_OF_GODDESS, 1))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(907, creature->GetGUID());
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;
}
void hyjalAI::StartEvent(Player* pPlayer)
void hyjalAI::StartEvent(Player* player)
{
if (!pPlayer || IsDummy || !pInstance)
if (!player || IsDummy || !pInstance)
return;
Talk(BEGIN);
@@ -592,7 +592,7 @@ void hyjalAI::StartEvent(Player* pPlayer)
NextWaveTimer = 15000;
CheckTimer = 5000;
PlayerGUID = pPlayer->GetGUID();
PlayerGUID = player->GetGUID();
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:
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());
if (!pAI)
@@ -242,7 +242,7 @@ public:
switch (action)
{
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->bStepping = false;
pAI->uiStep = 1;
@@ -268,13 +268,13 @@ public:
pAI->uiStep = 85;
break;
}
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
pAI->SetDespawnAtFar(true);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
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());
@@ -284,32 +284,32 @@ public:
{
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)
return false;
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(907, creature->GetGUID());
break;
}
case 1:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_1, creature->GetGUID());
break;
case 2:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_2, creature->GetGUID());
break;
case 3:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_3, creature->GetGUID());
break;
case 4:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_4, creature->GetGUID());
break;
case 5:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_5, creature->GetGUID());
break;
default:
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:
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, SPELL_CHRONO_BEACON, false);
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, SPELL_CHRONO_BEACON, false);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_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);
pPlayer->SEND_GOSSIP_MENU(10000, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(10000, creature->GetGUID());
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);
pPlayer->SEND_GOSSIP_MENU(10001, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(10001, creature->GetGUID());
return true;
}
pPlayer->SEND_GOSSIP_MENU(10002, creature->GetGUID());
player->SEND_GOSSIP_MENU(10002, creature->GetGUID());
return true;
}
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+7 -7
View File
@@ -124,12 +124,12 @@ public:
return false;
}
void OnPlayerEnter(Player* pPlayer)
void OnPlayerEnter(Player* player)
{
if (GetData(TYPE_MEDIVH) == IN_PROGRESS)
return;
pPlayer->SendUpdateWorldState(WORLD_STATE_BM, 0);
player->SendUpdateWorldState(WORLD_STATE_BM, 0);
}
void OnCreatureCreate(Creature* creature)
@@ -208,13 +208,13 @@ public:
{
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)
pPlayer->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL);
if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL);
if (pPlayer->GetQuestStatus(QUEST_MASTER_TOUCH) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(QUEST_MASTER_TOUCH);
if (player->GetQuestStatus(QUEST_MASTER_TOUCH) == QUEST_STATUS_INCOMPLETE)
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:
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())
{
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)
{
if (Player* pPlayer = itr->getSource())
pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0);
if (Player* player = itr->getSource())
player->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0);
}
}
}
@@ -119,9 +119,9 @@ public:
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);
return;
@@ -146,7 +146,7 @@ public:
if (mBarrelCount == 5)
{
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;
}
}
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+42 -42
View File
@@ -51,39 +51,39 @@ class npc_erozion : public CreatureScript
public:
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)
{
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)
{
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS, 1))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !player->HasItemCount(ITEM_ENTRY_BOMBS, 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)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
if (player->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE)
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;
}
@@ -198,14 +198,14 @@ public:
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();
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
if (pInstance)
{
pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS);
@@ -215,7 +215,7 @@ public:
DoScriptText(SAY_TH_START_EVENT_PART1, creature);
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()))->SetDespawnAtEnd(false);
@@ -223,12 +223,12 @@ public:
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, creature->GetGUID());
break;
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);
if (pInstance)
pInstance->SetData(TYPE_THRALL_PART2, IN_PROGRESS);
@@ -239,7 +239,7 @@ public:
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
if (pInstance)
pInstance->SetData(TYPE_THRALL_PART3, IN_PROGRESS);
CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())->StartWP();
@@ -248,12 +248,12 @@ public:
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
{
pPlayer->PrepareQuestMenu(creature->GetGUID());
pPlayer->SendPreparedQuest(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
player->SendPreparedQuest(creature->GetGUID());
}
InstanceScript* pInstance = creature->GetInstanceScript();
@@ -261,20 +261,20 @@ public:
{
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);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WALKING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(GOSSIP_ID_START, creature->GetGUID());
}
if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2))
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, creature->GetGUID());
}
if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3))
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, creature->GetGUID());
}
}
return true;
@@ -439,8 +439,8 @@ public:
//trigger taretha to run down outside
if (Creature* Taretha = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TARETHA)))
{
if (Player* pPlayer = GetPlayerForEscort())
CAST_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, pPlayer->GetGUID());
if (Player* player = GetPlayerForEscort())
CAST_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, player->GetGUID());
}
//kill credit Creature for quest
@@ -450,8 +450,8 @@ public:
{
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* pPlayer = itr->getSource())
pPlayer->KilledMonsterCredit(20156, 0);
if (Player* player = itr->getSource())
player->KilledMonsterCredit(20156, 0);
}
}
@@ -581,18 +581,18 @@ public:
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();
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);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, creature->GetGUID());
}
if (uiAction == GOSSIP_ACTION_INFO_DEF+2)
{
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS)
{
@@ -611,13 +611,13 @@ public:
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, creature->GetGUID());
}
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:
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)
{
pPlayer->CastSpell(pPlayer, SPELL_TEACHING_GOLDTHORN_TEA, true);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_TEA_ANSWER, creature->GetGUID());
player->CastSpell(player, SPELL_TEACHING_GOLDTHORN_TEA, true);
player->SEND_GOSSIP_MENU(GOSSIP_TEXT_TEA_ANSWER, creature->GetGUID());
}
if (uiAction == GOSSIP_ACTION_INFO_DEF + 2)
{
pPlayer->CastSpell(pPlayer, SPELL_TEACHING_MIGHTY_TROLLS_BLOOD_POTION, true);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_POTION_ANSWER, creature->GetGUID());
player->CastSpell(player, SPELL_TEACHING_MIGHTY_TROLLS_BLOOD_POTION, true);
player->SEND_GOSSIP_MENU(GOSSIP_TEXT_POTION_ANSWER, creature->GetGUID());
}
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))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if (player->GetBaseSkillValue(SKILL_COOKING) >= 175 && !player->HasSpell(SPELL_GOLDTHORN_TEA))
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))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_POTION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
if (player->GetBaseSkillValue(SKILL_ALCHEMY) >= 180 && !player->HasSpell(SPELL_MIGHT_TROLLS_BLOOD_POTION))
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;
}
@@ -93,7 +93,7 @@ class go_gong : public GameObjectScript
public:
go_gong() : GameObjectScript("go_gong") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO)
bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{
//basic support, not blizzlike data is missing...
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:
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)
{
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
DoScriptText(SAY_READY, creature, pPlayer);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
DoScriptText(SAY_READY, creature, player);
creature->setFaction(113);
}
@@ -74,52 +74,52 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch (i)
{
case 3:
me->HandleEmoteCommand(EMOTE_STATE_POINT);
DoScriptText(SAY_POINT, me, pPlayer);
DoScriptText(SAY_POINT, me, player);
break;
case 4:
me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break;
case 8:
DoScriptText(SAY_BLUELEAF, me, pPlayer);
DoScriptText(SAY_BLUELEAF, me, player);
break;
case 9:
DoScriptText(SAY_DANGER, me, pPlayer);
DoScriptText(SAY_DANGER, me, player);
break;
case 13:
DoScriptText(SAY_BAD, me, pPlayer);
DoScriptText(SAY_BAD, me, player);
break;
case 14:
me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break;
case 25:
DoScriptText(SAY_THINK, me, pPlayer);
DoScriptText(SAY_THINK, me, player);
break;
case 31:
DoScriptText(SAY_SOON, me, pPlayer);
DoScriptText(SAY_SOON, me, player);
break;
case 42:
DoScriptText(SAY_FINALY, me, pPlayer);
DoScriptText(SAY_FINALY, me, player);
break;
case 43:
me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break;
case 45:
DoScriptText(SAY_WIN, me, pPlayer);
DoScriptText(SAY_WIN, me, player);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me);
if (player && player->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(player)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me);
break;
case 46:
DoScriptText(SAY_END, me, pPlayer);
DoScriptText(SAY_END, me, player);
break;
}
}
@@ -138,8 +138,8 @@ public:
void JustDied(Unit* /*killer*/)
{
if (Player* pPlayer = GetPlayerForEscort())
CAST_PLR(pPlayer)->FailQuest(QUEST_WILLIX_THE_IMPORTER);
if (Player* player = GetPlayerForEscort())
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);
}
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();
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
{
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
if (pInstance)
pInstance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS);
@@ -100,25 +100,25 @@ public:
creature->setFaction(250);
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()))->SetDespawnAtEnd(false);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
InstanceScript *pInstance = creature->GetInstanceScript();
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) &&
(pInstance->GetData(TYPE_LADY_ANACONDRA) == DONE) && (pInstance->GetData(TYPE_LORD_SERPENTIS) == DONE))
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NARALEX, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NARALEX, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, creature->GetGUID());
if (!pInstance->GetData(TYPE_NARALEX_YELLED))
{
@@ -128,7 +128,7 @@ public:
}
else
{
pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_1, creature->GetGUID());
player->SEND_GOSSIP_MENU(GOSSIP_ID_START_1, creature->GetGUID());
}
}
return true;
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+21 -21
View File
@@ -61,32 +61,32 @@ class npc_sergeant_bly : public CreatureScript
public:
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI, creature->AI())->PlayerGUID = pPlayer->GetGUID();
player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI, creature->AI())->PlayerGUID = player->GetGUID();
creature->AI()->DoAction(0);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (InstanceScript* pInstance = creature->GetInstanceScript())
{
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);
pPlayer->SEND_GOSSIP_MENU(1517, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(1517, creature->GetGUID());
}
else
if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_NOT_STARTED)
pPlayer->SEND_GOSSIP_MENU(1515, creature->GetGUID());
player->SEND_GOSSIP_MENU(1515, creature->GetGUID());
else
pPlayer->SEND_GOSSIP_MENU(1516, creature->GetGUID());
player->SEND_GOSSIP_MENU(1516, creature->GetGUID());
return true;
}
return false;
@@ -216,7 +216,7 @@ class go_troll_cage : public GameObjectScript
public:
go_troll_cage() : GameObjectScript("go_troll_cage") { }
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo)
bool OnGossipHello(Player* /*player*/, GameObject* pGo)
{
if (InstanceScript* pInstance = pGo->GetInstanceScript())
{
@@ -258,33 +258,33 @@ class npc_weegli_blastfuse : public CreatureScript
public:
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
//here we make him run to door, set the charge and run away off to nowhere
creature->AI()->DoAction(0);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (InstanceScript* pInstance = creature->GetInstanceScript())
{
switch (pInstance->GetData(EVENT_PYRAMID))
{
case PYRAMID_KILLED_ALL_TROLLS:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(1514, creature->GetGUID()); //if event can proceed to end
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(1514, creature->GetGUID()); //if event can proceed to end
break;
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;
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;
}
@@ -410,7 +410,7 @@ class go_shallow_grave : public GameObjectScript
public:
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
if (pGo->GetUseCount() == 0)
@@ -443,9 +443,9 @@ class at_zumrah : public AreaTriggerScript
public:
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)
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)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch (i)
{
case 1:
DoScriptText(SAY_MOVE, me, pPlayer);
DoScriptText(SAY_MOVE, me, player);
break;
case 8:
DoScriptText(SAY_PREPARE, me, pPlayer);
DoScriptText(SAY_PREPARE, me, player);
break;
case 19:
//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);
break;
case 20:
DoScriptText(SAY_WIN, me, pPlayer);
DoScriptText(SAY_WIN, me, player);
Completed = true;
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_TOREK_ASSULT, me);
if (player)
player->GroupEventHappens(QUEST_TOREK_ASSULT, me);
break;
case 21:
DoScriptText(SAY_END, me, pPlayer);
DoScriptText(SAY_END, me, player);
break;
}
}
@@ -181,9 +181,9 @@ class npc_ruul_snowhoof : public CreatureScript
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch(i)
@@ -206,8 +206,8 @@ class npc_ruul_snowhoof : public CreatureScript
break;
case 21:{
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_FREEDOM_TO_RUUL, me);
if (player)
player->GroupEventHappens(QUEST_FREEDOM_TO_RUUL, me);
break; }
}
@@ -317,17 +317,17 @@ class npc_muglash : public CreatureScript
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
switch(i)
{
case 0:
if (pPlayer)
DoScriptText(SAY_MUG_START2, me, pPlayer);
if (player)
DoScriptText(SAY_MUG_START2, me, player);
break;
case 24:
if (pPlayer)
DoScriptText(SAY_MUG_BRAZIER, me, pPlayer);
if (player)
DoScriptText(SAY_MUG_BRAZIER, me, player);
if (GameObject* pGo = GetClosestGameObjectWithEntry(me, GO_NAGA_BRAZIER, INTERACTION_DISTANCE*2))
{
@@ -338,8 +338,8 @@ class npc_muglash : public CreatureScript
case 25:
DoScriptText(SAY_MUG_GRATITUDE, me);
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_VORSHA, me);
if (player)
player->GroupEventHappens(QUEST_VORSHA, me);
break;
case 26:
DoScriptText(SAY_MUG_PATROL, me);
@@ -352,11 +352,11 @@ class npc_muglash : public CreatureScript
void EnterCombat(Unit* /*pWho*/)
{
if (Player* pPlayer = GetPlayerForEscort())
if (Player* player = GetPlayerForEscort())
if (HasEscortState(STATE_ESCORT_PAUSED))
{
if (urand(0, 1))
DoScriptText(SAY_MUG_ON_GUARD, me, pPlayer);
DoScriptText(SAY_MUG_ON_GUARD, me, player);
return;
}
}
@@ -370,12 +370,12 @@ class npc_muglash : public CreatureScript
void JustDied(Unit* /*pKiller*/)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
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:
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)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(2744);
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(2744);
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
player->SEND_GOSSIP_MENU(1813, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+21:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
player->SEND_GOSSIP_MENU(1814, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+22:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
player->SEND_GOSSIP_MENU(1815, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+23:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
player->SEND_GOSSIP_MENU(1816, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+24:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_LT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
player->SEND_GOSSIP_MENU(1817, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+25:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(3141);
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(3141);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (player->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE)
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)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_LT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
if (player->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -267,25 +267,25 @@ class mob_rizzle_sprysprocket : public CreatureScript
public:
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();
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1 && pPlayer->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1 && player->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
{
pPlayer->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true);
player->CLOSE_GOSSIP_MENU();
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 = 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;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(10811, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(10811, creature->GetGUID());
return true;
}
@@ -361,8 +361,8 @@ public:
me->AI_SendMoveToPacket(3706.39f, -3969.15f, 35.9118f, 0, 0, 0);
}
//begin swimming and summon depth charges
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
SendText(MSG_ESCAPE_NOTICE, pPlayer);
Player* player = Unit::GetPlayer(*me, PlayerGUID);
SendText(MSG_ESCAPE_NOTICE, player);
DoCast(me, SPELL_PERIODIC_DEPTH_CHARGE);
me->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_SWIMMING);
me->SetSpeed(MOVE_RUN, 0.85f, true);
@@ -382,25 +382,25 @@ public:
if (Grenade_Timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer)
Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (player)
{
DoScriptText(SAY_RIZZLE_GRENADE, me, pPlayer);
DoCast(pPlayer, SPELL_RIZZLE_FROST_GRENADE, true);
DoScriptText(SAY_RIZZLE_GRENADE, me, player);
DoCast(player, SPELL_RIZZLE_FROST_GRENADE, true);
}
Grenade_Timer = 30000;
} else Grenade_Timer -= diff;
if (Check_Timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer)
Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (!player)
{
me->DespawnOrUnsummon();
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);
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);
sWorld->SendServerMessage(SERVER_MSG_STRING, text, pPlayer);
sWorld->SendServerMessage(SERVER_MSG_STRING, text, player);
}
void AttackStart(Unit* who)
src/server/scripts/Kalimdor/azuremyst_isle.cpp
+24 -24
View File
@@ -134,11 +134,11 @@ public:
{
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();
@@ -195,24 +195,24 @@ class npc_engineer_spark_overgrind : public CreatureScript
public:
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
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;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (pPlayer->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (player->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -349,13 +349,13 @@ class npc_magwin : public CreatureScript
public:
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)
{
creature->setFaction(113);
if (npc_escortAI* pEscortAI = CAST_AI(npc_escortAI, creature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID());
pEscortAI->Start(true, false, player->GetGUID());
}
return true;
}
@@ -371,26 +371,26 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch(i)
{
case 0:
DoScriptText(SAY_START, me, pPlayer);
DoScriptText(SAY_START, me, player);
break;
case 17:
DoScriptText(SAY_PROGRESS, me, pPlayer);
DoScriptText(SAY_PROGRESS, me, player);
break;
case 28:
DoScriptText(SAY_END1, me, pPlayer);
DoScriptText(SAY_END1, me, player);
break;
case 29:
DoScriptText(EMOTE_HUG, me, pPlayer);
DoScriptText(SAY_END2, me, pPlayer);
pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me);
DoScriptText(EMOTE_HUG, me, player);
DoScriptText(SAY_END2, me, player);
player->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me);
break;
}
}
@@ -586,15 +586,15 @@ class go_ravager_cage : public GameObjectScript
public:
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))
{
ravager->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
ravager->SetReactState(REACT_AGGRESSIVE);
ravager->AI()->AttackStart(pPlayer);
ravager->AI()->AttackStart(player);
}
}
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:
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)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(9137, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(9138, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->SEND_GOSSIP_MENU(9139, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(9140, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->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->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
player->SEND_GOSSIP_MENU(9141, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->TalkedToCreature(C_SUNHAWK_TRIGGER, creature->GetGUID());
player->CLOSE_GOSSIP_MENU();
player->TalkedToCreature(C_SUNHAWK_TRIGGER, creature->GetGUID());
break;
}
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);
pPlayer->SEND_GOSSIP_MENU(9136, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_CSA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(9136, creature->GetGUID());
}
else
pPlayer->SEND_GOSSIP_MENU(9134, creature->GetGUID());
player->SEND_GOSSIP_MENU(9134, creature->GetGUID());
return true;
}
src/server/scripts/Kalimdor/darkshore.cpp
+31 -31
View File
@@ -70,15 +70,15 @@ class npc_kerlonian : public CreatureScript
public:
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 (npc_kerlonianAI* pKerlonianAI = CAST_AI(npc_kerlonian::npc_kerlonianAI, creature->AI()))
{
creature->SetStandState(UNIT_STAND_STATE_STAND);
DoScriptText(SAY_KER_START, creature, pPlayer);
pKerlonianAI->StartFollow(pPlayer, FACTION_KER_ESCORTEE, pQuest);
DoScriptText(SAY_KER_START, creature, player);
pKerlonianAI->StartFollow(player, FACTION_KER_ESCORTEE, pQuest);
}
}
@@ -109,10 +109,10 @@ public:
{
if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE*5))
{
if (Player* pPlayer = GetLeaderForFollower())
if (Player* player = GetLeaderForFollower())
{
if (pPlayer->GetQuestStatus(QUEST_SLEEPER_AWAKENED) == QUEST_STATUS_INCOMPLETE)
pPlayer->GroupEventHappens(QUEST_SLEEPER_AWAKENED, me);
if (player->GetQuestStatus(QUEST_SLEEPER_AWAKENED) == QUEST_STATUS_INCOMPLETE)
player->GroupEventHappens(QUEST_SLEEPER_AWAKENED, me);
DoScriptText(SAY_KER_END, me);
}
@@ -209,12 +209,12 @@ class npc_prospector_remtravel : public CreatureScript
public:
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 (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);
}
@@ -233,48 +233,48 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch(i)
{
case 0:
DoScriptText(SAY_REM_START, me, pPlayer);
DoScriptText(SAY_REM_START, me, player);
break;
case 5:
DoScriptText(SAY_REM_RAMP1_1, me, pPlayer);
DoScriptText(SAY_REM_RAMP1_1, me, player);
break;
case 6:
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);
break;
case 9:
DoScriptText(SAY_REM_RAMP1_2, me, pPlayer);
DoScriptText(SAY_REM_RAMP1_2, me, player);
break;
case 14:
//depend quest rewarded?
DoScriptText(SAY_REM_BOOK, me, pPlayer);
DoScriptText(SAY_REM_BOOK, me, player);
break;
case 15:
DoScriptText(SAY_REM_TENT1_1, me, pPlayer);
DoScriptText(SAY_REM_TENT1_1, me, player);
break;
case 16:
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);
break;
case 17:
DoScriptText(SAY_REM_TENT1_2, me, pPlayer);
DoScriptText(SAY_REM_TENT1_2, me, player);
break;
case 26:
DoScriptText(SAY_REM_MOSS, me, pPlayer);
DoScriptText(SAY_REM_MOSS, me, player);
break;
case 27:
DoScriptText(EMOTE_REM_MOSS, me, pPlayer);
DoScriptText(EMOTE_REM_MOSS, me, player);
break;
case 28:
DoScriptText(SAY_REM_MOSS_PROGRESS, me, pPlayer);
DoScriptText(SAY_REM_MOSS_PROGRESS, me, player);
break;
case 29:
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);
break;
case 31:
DoScriptText(SAY_REM_PROGRESS, me, pPlayer);
DoScriptText(SAY_REM_PROGRESS, me, player);
break;
case 41:
DoScriptText(SAY_REM_REMEMBER, me, pPlayer);
DoScriptText(SAY_REM_REMEMBER, me, player);
break;
case 42:
DoScriptText(EMOTE_REM_END, me, pPlayer);
pPlayer->GroupEventHappens(QUEST_ABSENT_MINDED_PT2, me);
DoScriptText(EMOTE_REM_END, me, player);
player->GroupEventHappens(QUEST_ABSENT_MINDED_PT2, me);
break;
}
}
@@ -331,29 +331,29 @@ class npc_threshwackonator : public CreatureScript
public:
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
if (npc_threshwackonatorAI* pThreshAI = CAST_AI(npc_threshwackonator::npc_threshwackonatorAI, creature->AI()))
{
DoScriptText(EMOTE_START, creature);
pThreshAI->StartFollow(pPlayer);
pThreshAI->StartFollow(player);
}
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (pPlayer->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);
if (player->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE)
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;
}
src/server/scripts/Kalimdor/desolace.cpp
+16 -16
View File
@@ -57,18 +57,18 @@ class npc_aged_dying_ancient_kodo : public CreatureScript
public:
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
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();
}
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
@@ -176,10 +176,10 @@ class go_iruxos : public GameObjectScript
public:
go_iruxos() : GameObjectScript("go_iruxos") { }
bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
if (pPlayer->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE)
pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(), pPlayer->GetInnPosY(), pPlayer->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
if (player->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE)
player->SummonCreature(11876, player->GetInnPosX(), player->GetInnPosY(), player->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
return true;
}
@@ -197,13 +197,13 @@ class npc_dalinda : public CreatureScript
public:
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 (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);
}
}
@@ -221,15 +221,15 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
switch (i)
{
case 1:
me->IsStandState();
break;
case 15:
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_RETURN_TO_VAHLARRIEL, me);
if (player)
player->GroupEventHappens(QUEST_RETURN_TO_VAHLARRIEL, me);
break;
}
}
@@ -240,9 +240,9 @@ public:
void JustDied(Unit* /*pKiller*/)
{
Player* pPlayer = GetPlayerForEscort();
if (pPlayer)
pPlayer->FailQuest(QUEST_RETURN_TO_VAHLARRIEL);
Player* player = GetPlayerForEscort();
if (player)
player->FailQuest(QUEST_RETURN_TO_VAHLARRIEL);
return;
}
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+59 -59
View File
@@ -147,32 +147,32 @@ class npc_deserter_agitator : public CreatureScript
public:
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)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DESERTER, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
if (player->GetQuestStatus(QUEST_TRAITORS_AMONG_US) == QUEST_STATUS_INCOMPLETE)
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;
}
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
switch (urand(0, 1))
{
case 0:
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
creature->setFaction(14);
creature->AI()->AttackStart(pPlayer);
creature->AI()->AttackStart(player);
break;
case 1:
pPlayer->KilledMonsterCredit(NPC_THERAMORE_DESERTER, 0);
player->KilledMonsterCredit(NPC_THERAMORE_DESERTER, 0);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
creature->SetSpeed(MOVE_RUN, creature->GetSpeedRate(MOVE_RUN), true);
creature->setFaction(35);
@@ -245,24 +245,24 @@ class npc_theramore_guard : public CreatureScript
public:
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)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE)
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;
}
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0);
player->CLOSE_GOSSIP_MENU();
player->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0);
DoScriptText(SAY_QUEST1, creature);
creature->CastSpell(creature, SPELL_DOCTORED_LEAFLET, false);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -337,26 +337,26 @@ class npc_lady_jaina_proudmoore : public CreatureScript
public:
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)
{
pPlayer->SEND_GOSSIP_MENU(7012, creature->GetGUID());
pPlayer->CastSpell(pPlayer, SPELL_JAINAS_AUTOGRAPH, false);
player->SEND_GOSSIP_MENU(7012, creature->GetGUID());
player->CastSpell(player, SPELL_JAINAS_AUTOGRAPH, false);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_JAINAS_AUTOGRAPH) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
if (player->GetQuestStatus(QUEST_JAINAS_AUTOGRAPH) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -377,27 +377,27 @@ class npc_nat_pagle : public CreatureScript
public:
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)
pPlayer->GetSession()->SendListInventory(creature->GetGUID());
player->GetSession()->SendListInventory(creature->GetGUID());
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->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);
pPlayer->SEND_GOSSIP_MENU(7640, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU(7640, creature->GetGUID());
}
else
pPlayer->SEND_GOSSIP_MENU(7638, creature->GetGUID());
player->SEND_GOSSIP_MENU(7638, creature->GetGUID());
return true;
}
@@ -431,7 +431,7 @@ class npc_private_hendel : public CreatureScript
public:
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)
creature->setFaction(FACTION_HOSTILE);
@@ -470,8 +470,8 @@ public:
{
uiDamage = 0;
if (Player* pPlayer = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself())
pPlayer->GroupEventHappens(QUEST_MISSING_DIPLO_PT16, me);
if (Player* player = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself())
player->GroupEventHappens(QUEST_MISSING_DIPLO_PT16, me);
DoScriptText(EMOTE_SURRENDER, me);
EnterEvadeMode();
@@ -588,7 +588,7 @@ public:
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)
{
@@ -597,7 +597,7 @@ public:
creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
creature->SetStandState(UNIT_STAND_STATE_STAND);
DoScriptText(SAY_QUEST_ACCEPTED, creature);
pEscortAI->Start(false, false, pPlayer->GetGUID());
pEscortAI->Start(false, false, player->GetGUID());
}
}
return true;
@@ -609,42 +609,42 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
if (!pPlayer)
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
{
case 7:
DoScriptText(SAY_STAY_1, me, pPlayer);
DoScriptText(SAY_STAY_1, me, player);
break;
case 11:
DoScriptText(SAY_STAY_2, me, pPlayer);
DoScriptText(SAY_STAY_2, me, player);
break;
case 25:
DoScriptText(SAY_STAY_3, me, pPlayer);
DoScriptText(SAY_STAY_3, me, player);
break;
case 26:
DoScriptText(SAY_STAY_4, me, pPlayer);
DoScriptText(SAY_STAY_4, me, player);
break;
case 27:
DoScriptText(SAY_STAY_5, me, pPlayer);
DoScriptText(SAY_STAY_5, me, player);
break;
case 28:
DoScriptText(SAY_STAY_6, me, pPlayer);
DoScriptText(SAY_STAY_6, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
break;
case 29:
me->SetStandState(UNIT_STAND_STATE_STAND);
break;
case 37:
DoScriptText(SAY_QUEST_COMPLETE, me, pPlayer);
DoScriptText(SAY_QUEST_COMPLETE, me, player);
me->SetSpeed(MOVE_RUN, 1.2f, true);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (pPlayer && pPlayer->GetQuestStatus(QUEST_STINKYS_ESCAPE_H))
pPlayer->GroupEventHappens(QUEST_STINKYS_ESCAPE_H, me);
if (pPlayer && pPlayer->GetQuestStatus(QUEST_STINKYS_ESCAPE_A))
pPlayer->GroupEventHappens(QUEST_STINKYS_ESCAPE_A, me);
if (player && player->GetQuestStatus(QUEST_STINKYS_ESCAPE_H))
player->GroupEventHappens(QUEST_STINKYS_ESCAPE_H, me);
if (player && player->GetQuestStatus(QUEST_STINKYS_ESCAPE_A))
player->GroupEventHappens(QUEST_STINKYS_ESCAPE_A, me);
break;
case 39:
DoScriptText(EMOTE_DISAPPEAR, me);
@@ -662,13 +662,13 @@ public:
void JustDied(Unit* /*pKiller*/)
{
Player* pPlayer = GetPlayerForEscort();
if (HasEscortState(STATE_ESCORT_ESCORTING) && pPlayer)
Player* player = GetPlayerForEscort();
if (HasEscortState(STATE_ESCORT_ESCORTING) && player)
{
if (pPlayer->GetQuestStatus(QUEST_STINKYS_ESCAPE_H))
pPlayer->FailQuest(QUEST_STINKYS_ESCAPE_H);
if (pPlayer->GetQuestStatus(QUEST_STINKYS_ESCAPE_A))
pPlayer->FailQuest(QUEST_STINKYS_ESCAPE_A);
if (player->GetQuestStatus(QUEST_STINKYS_ESCAPE_H))
player->FailQuest(QUEST_STINKYS_ESCAPE_H);
if (player->GetQuestStatus(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:
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 15120, false);
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, 15120, false);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
uint32 eCreature = creature->GetEntry();
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
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);
pPlayer->SEND_GOSSIP_MENU(2848, creature->GetGUID());
} else if (pPlayer->GetTeam() == HORDE)
pPlayer->SEND_GOSSIP_MENU(2845, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(2848, creature->GetGUID());
} else if (player->GetTeam() == HORDE)
player->SEND_GOSSIP_MENU(2845, creature->GetGUID());
else
pPlayer->SEND_GOSSIP_MENU(2844, creature->GetGUID());
player->SEND_GOSSIP_MENU(2844, creature->GetGUID());
}
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);
pPlayer->SEND_GOSSIP_MENU(2849, creature->GetGUID());
} else if (pPlayer->GetTeam() == ALLIANCE)
pPlayer->SEND_GOSSIP_MENU(2843, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(2849, creature->GetGUID());
} else if (player->GetTeam() == ALLIANCE)
player->SEND_GOSSIP_MENU(2843, creature->GetGUID());
else
pPlayer->SEND_GOSSIP_MENU(2842, creature->GetGUID());
player->SEND_GOSSIP_MENU(2842, creature->GetGUID());
}
return true;
src/server/scripts/Kalimdor/feralas.cpp
+19 -19
View File
@@ -37,28 +37,28 @@ class npc_gregan_brewspewer : public CreatureScript
public:
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)
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
pPlayer->SEND_GOSSIP_MENU(2434, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU(2434, creature->GetGUID());
}
if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->GetSession()->SendListInventory(creature->GetGUID());
player->GetSession()->SendListInventory(creature->GetGUID());
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (creature->isVendor() && player->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -94,7 +94,7 @@ class npc_oox22fe : public CreatureScript
public:
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)
{
@@ -102,14 +102,14 @@ public:
//change that the npc is not lying dead on the ground
creature->SetStandState(UNIT_STAND_STATE_STAND);
if (pPlayer->GetTeam() == ALLIANCE)
if (player->GetTeam() == ALLIANCE)
creature->setFaction(FACTION_ESCORTEE_A);
if (pPlayer->GetTeam() == HORDE)
if (player->GetTeam() == HORDE)
creature->setFaction(FACTION_ESCORTEE_H);
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;
@@ -153,9 +153,9 @@ public:
case 37:
DoScriptText(SAY_OOX_END, me);
// Award quest credit
if (Player* pPlayer = GetPlayerForEscort())
if (Player* player = GetPlayerForEscort())
{
pPlayer->GroupEventHappens(QUEST_RESCUE_OOX22FE, me);
player->GroupEventHappens(QUEST_RESCUE_OOX22FE, me);
}
break;
}
@@ -191,10 +191,10 @@ class npc_screecher_spirit : public CreatureScript
public:
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());
pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
player->SEND_GOSSIP_MENU(2039, creature->GetGUID());
player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return true;
src/server/scripts/Kalimdor/moonglade.cpp
+79 -79
View File
@@ -54,45 +54,45 @@ class npc_bunthen_plainswind : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->CLOSE_GOSSIP_MENU();
if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE)
pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE);
player->CLOSE_GOSSIP_MENU();
if (player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE)
player->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE);
break;
case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->SEND_GOSSIP_MENU(5373, creature->GetGUID());
player->SEND_GOSSIP_MENU(5373, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(5376, creature->GetGUID());
player->SEND_GOSSIP_MENU(5376, creature->GetGUID());
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (pPlayer->getClass() != CLASS_DRUID)
pPlayer->SEND_GOSSIP_MENU(4916, creature->GetGUID());
else if (pPlayer->GetTeam() != HORDE)
if (player->getClass() != CLASS_DRUID)
player->SEND_GOSSIP_MENU(4916, creature->GetGUID());
else if (player->GetTeam() != HORDE)
{
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
if (player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
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)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
if (player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -113,44 +113,44 @@ class npc_great_bear_spirit : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(4721, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(4721, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(4733, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(4733, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(4734, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(4734, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(4735, creature->GetGUID());
if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(5929);
if (pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
pPlayer->AreaExploredOrEventHappens(5930);
player->SEND_GOSSIP_MENU(4735, creature->GetGUID());
if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(5929);
if (player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(5930);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
//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);
pPlayer->SEND_GOSSIP_MENU(4719, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(4719, creature->GetGUID());
}
else
pPlayer->SEND_GOSSIP_MENU(4718, creature->GetGUID());
player->SEND_GOSSIP_MENU(4718, creature->GetGUID());
return true;
}
@@ -169,45 +169,45 @@ class npc_silva_filnaveth : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->CLOSE_GOSSIP_MENU();
if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE)
pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY);
player->CLOSE_GOSSIP_MENU();
if (player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE)
player->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY);
break;
case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->SEND_GOSSIP_MENU(5374, creature->GetGUID());
player->SEND_GOSSIP_MENU(5374, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->SEND_GOSSIP_MENU(5375, creature->GetGUID());
player->SEND_GOSSIP_MENU(5375, creature->GetGUID());
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (pPlayer->getClass() != CLASS_DRUID)
pPlayer->SEND_GOSSIP_MENU(4913, creature->GetGUID());
else if (pPlayer->GetTeam() != ALLIANCE)
if (player->getClass() != CLASS_DRUID)
player->SEND_GOSSIP_MENU(4913, creature->GetGUID());
else if (player->GetTeam() != ALLIANCE)
{
if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
if (player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
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)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
if (player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -325,10 +325,10 @@ public:
if (!PlayerGUID)
return;
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
{
pPlayer->FailQuest(10965);
player->FailQuest(10965);
PlayerGUID = 0;
Reset();
}
@@ -336,10 +336,10 @@ public:
void EnterEvadeMode()
{
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper())
Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (player && player->isInCombat() && player->getAttackerForHelper())
{
AttackStart(pPlayer->getAttackerForHelper());
AttackStart(player->getAttackerForHelper());
return;
}
npc_escortAI::EnterEvadeMode();
@@ -355,17 +355,17 @@ public:
}
}
void StartEvent(Player* pPlayer)
void StartEvent(Player* player)
{
if (!pPlayer)
if (!player)
return;
if (pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
if (player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
{
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]);
}
PlayerGUID = pPlayer->GetGUID();
PlayerGUID = player->GetGUID();
Start(true, false, PlayerGUID);
}
return;
@@ -385,9 +385,9 @@ public:
{
if (checkPlayer_Timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper())
AttackStart(pPlayer->getAttackerForHelper());
Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (player && player->isInCombat() && player->getAttackerForHelper())
AttackStart(player->getAttackerForHelper());
checkPlayer_Timer = 1000;
} else checkPlayer_Timer -= diff;
}
@@ -395,8 +395,8 @@ public:
if (Event_onWait && Event_Timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer || (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_NONE))
Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (!player || (player && player->GetQuestStatus(10965) == QUEST_STATUS_NONE))
{
me->setDeathState(JUST_DIED);
return;
@@ -427,7 +427,7 @@ public:
break;
case 1:
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;
break;
}
@@ -450,7 +450,7 @@ public:
switch(Step)
{
case 0:
DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, pPlayer);
DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, player);
Event_Timer = 15000;
Step = 1;
break;
@@ -497,7 +497,7 @@ public:
switch(Step)
{
case 0:
DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, pPlayer);
DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, player);
Event_Timer = 4000;
Step = 1;
break;
@@ -511,8 +511,8 @@ public:
{
case 0:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2);
DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, me, pPlayer);
pPlayer->CompleteQuest(10965);
DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, me, player);
player->CompleteQuest(10965);
Event_Timer = 1500;
Step = 1;
break;
@@ -522,7 +522,7 @@ public:
Step = 2;
break;
case 2:
pPlayer->TalkedToCreature(me->GetEntry(), me->GetGUID());
player->TalkedToCreature(me->GetEntry(), me->GetGUID());
PlayerGUID = 0;
Reset();
me->setDeathState(JUST_DIED);
@@ -559,13 +559,13 @@ class npc_clintar_dreamwalker : public CreatureScript
public:
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)
{
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)
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;
}
src/server/scripts/Kalimdor/mulgore.cpp
+8 -8
View File
@@ -43,24 +43,24 @@ class npc_skorn_whitecloud : public CreatureScript
public:
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)
pPlayer->SEND_GOSSIP_MENU(523, creature->GetGUID());
player->SEND_GOSSIP_MENU(523, creature->GetGUID());
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (!pPlayer->GetQuestRewardStatus(770))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (!player->GetQuestRewardStatus(770))
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;
}
src/server/scripts/Kalimdor/orgrimmar.cpp
+29 -29
View File
@@ -44,12 +44,12 @@ class npc_shenthul : public CreatureScript
public:
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)
{
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;
}
@@ -86,10 +86,10 @@ public:
{
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)
pPlayer->FailQuest(QUEST_SHATTERED_SALUTE);
if (player->GetTypeId() == TYPEID_PLAYER && player->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
player->FailQuest(QUEST_SHATTERED_SALUTE);
}
Reset();
} else Reset_Timer -= diff;
@@ -111,13 +111,13 @@ public:
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)
{
pPlayer->AreaExploredOrEventHappens(QUEST_SHATTERED_SALUTE);
player->AreaExploredOrEventHappens(QUEST_SHATTERED_SALUTE);
Reset();
}
}
@@ -149,52 +149,52 @@ class npc_thrall_warchief : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(5733, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(5733, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(5734, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(5734, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(5735, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->SEND_GOSSIP_MENU(5735, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(5736, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(5736, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(5737, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
player->SEND_GOSSIP_MENU(5737, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
pPlayer->SEND_GOSSIP_MENU(5738, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
player->SEND_GOSSIP_MENU(5738, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+7:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(QUEST_6566);
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(QUEST_6566);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HTW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (player->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE)
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;
}
src/server/scripts/Kalimdor/silithus.cpp
+64 -64
View File
@@ -49,57 +49,57 @@ class npc_highlord_demitrian : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(6842, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(6842, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(6843, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(6843, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(6844, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(6844, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(6867, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->SEND_GOSSIP_MENU(6867, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(6868, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(6868, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
pPlayer->SEND_GOSSIP_MENU(6869, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
player->SEND_GOSSIP_MENU(6869, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
pPlayer->SEND_GOSSIP_MENU(6870, creature->GetGUID());
player->SEND_GOSSIP_MENU(6870, creature->GetGUID());
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)
pPlayer->StoreNewItem(dest, 19016, true);
player->StoreNewItem(dest, 19016, true);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(7785) == QUEST_STATUS_NONE &&
(pPlayer->HasItemCount(18563, 1, false) || pPlayer->HasItemCount(18564, 1, false)))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (player->GetQuestStatus(7785) == QUEST_STATUS_NONE &&
(player->HasItemCount(18563, 1, false) || player->HasItemCount(18564, 1, false)))
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;
}
@@ -134,86 +134,86 @@ class npcs_rutgar_and_frankal : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(7755, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(7755, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(7756, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(7756, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(7757, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(7757, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(7758, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(7758, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
pPlayer->SEND_GOSSIP_MENU(7759, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->SEND_GOSSIP_MENU(7759, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 5:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
pPlayer->SEND_GOSSIP_MENU(7760, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->SEND_GOSSIP_MENU(7760, creature->GetGUID());
break;
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
pPlayer->KilledMonsterCredit(TRIGGER_RUTGAR, 0);
player->KilledMonsterCredit(TRIGGER_RUTGAR, 0);
break;
case GOSSIP_ACTION_INFO_DEF + 9:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(7762, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
player->SEND_GOSSIP_MENU(7762, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 10:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
pPlayer->SEND_GOSSIP_MENU(7763, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
player->SEND_GOSSIP_MENU(7763, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 11:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
pPlayer->SEND_GOSSIP_MENU(7764, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
player->SEND_GOSSIP_MENU(7764, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 12:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
pPlayer->SEND_GOSSIP_MENU(7765, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
player->SEND_GOSSIP_MENU(7765, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 13:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
pPlayer->SEND_GOSSIP_MENU(7766, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
player->SEND_GOSSIP_MENU(7766, creature->GetGUID());
break;
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
pPlayer->KilledMonsterCredit(TRIGGER_FRANKAL, 0);
player->KilledMonsterCredit(TRIGGER_FRANKAL, 0);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
if (player->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
creature->GetEntry() == 15170 &&
!pPlayer->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
!player->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR))
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 &&
pPlayer->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
player->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR))
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;
}
@@ -998,12 +998,12 @@ public:
void CheckEventFail()
{
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer)
if (!player)
return;
if (Group *EventGroup = pPlayer->GetGroup())
if (Group *EventGroup = player->GetGroup())
{
Player* GroupMember;
@@ -1029,7 +1029,7 @@ public:
++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
}
}
src/server/scripts/Kalimdor/stonetalon_mountains.cpp
+24 -24
View File
@@ -46,40 +46,40 @@ class npc_braug_dimspirit : public CreatureScript
public:
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 6766, false);
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, 6766, false);
}
if (uiAction == GOSSIP_ACTION_INFO_DEF+2)
{
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(6627);
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(6627);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(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);
pPlayer->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);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD3, 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);
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
pPlayer->SEND_GOSSIP_MENU(5819, creature->GetGUID());
player->SEND_GOSSIP_MENU(5819, creature->GetGUID());
return true;
}
@@ -116,9 +116,9 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
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_SORCERER, -36.37f, -496.23f, -45.71f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
case 18: me->SetInFront(pPlayer);
DoScriptText(SAY_END, me, pPlayer);
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_PROTECT_KAYA, me);
case 18: me->SetInFront(player);
DoScriptText(SAY_END, me, player);
if (player)
player->GroupEventHappens(QUEST_PROTECT_KAYA, me);
break;
}
}
@@ -145,12 +145,12 @@ public:
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 (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);
creature->setFaction(113);
src/server/scripts/Kalimdor/tanaris.cpp
+71 -71
View File
@@ -174,34 +174,34 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
if (!pPlayer)
Player* player = GetPlayerForEscort();
if (!player)
return;
switch(i)
{
case 0: DoScriptText(WHISPER_CUSTODIAN_1, me, pPlayer); break;
case 1: DoScriptText(WHISPER_CUSTODIAN_2, me, pPlayer); break;
case 2: DoScriptText(WHISPER_CUSTODIAN_3, me, pPlayer); break;
case 3: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break;
case 5: DoScriptText(WHISPER_CUSTODIAN_5, me, pPlayer); break;
case 6: DoScriptText(WHISPER_CUSTODIAN_6, me, pPlayer); break;
case 7: DoScriptText(WHISPER_CUSTODIAN_7, me, pPlayer); break;
case 8: DoScriptText(WHISPER_CUSTODIAN_8, me, pPlayer); break;
case 9: DoScriptText(WHISPER_CUSTODIAN_9, me, pPlayer); break;
case 10: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break;
case 13: DoScriptText(WHISPER_CUSTODIAN_10, me, pPlayer); break;
case 14: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break;
case 16: DoScriptText(WHISPER_CUSTODIAN_11, me, pPlayer); break;
case 17: DoScriptText(WHISPER_CUSTODIAN_12, me, pPlayer); break;
case 18: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break;
case 22: DoScriptText(WHISPER_CUSTODIAN_13, me, pPlayer); break;
case 23: DoScriptText(WHISPER_CUSTODIAN_4, me, pPlayer); break;
case 0: DoScriptText(WHISPER_CUSTODIAN_1, me, player); break;
case 1: DoScriptText(WHISPER_CUSTODIAN_2, me, player); break;
case 2: DoScriptText(WHISPER_CUSTODIAN_3, me, player); break;
case 3: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 5: DoScriptText(WHISPER_CUSTODIAN_5, me, player); break;
case 6: DoScriptText(WHISPER_CUSTODIAN_6, me, player); break;
case 7: DoScriptText(WHISPER_CUSTODIAN_7, me, player); break;
case 8: DoScriptText(WHISPER_CUSTODIAN_8, me, player); break;
case 9: DoScriptText(WHISPER_CUSTODIAN_9, me, player); break;
case 10: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 13: DoScriptText(WHISPER_CUSTODIAN_10, me, player); break;
case 14: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 16: DoScriptText(WHISPER_CUSTODIAN_11, me, player); break;
case 17: DoScriptText(WHISPER_CUSTODIAN_12, me, player); break;
case 18: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 22: DoScriptText(WHISPER_CUSTODIAN_13, me, player); break;
case 23: DoScriptText(WHISPER_CUSTODIAN_4, me, player); break;
case 24:
DoScriptText(WHISPER_CUSTODIAN_14, me, pPlayer);
DoCast(pPlayer, 34883);
DoScriptText(WHISPER_CUSTODIAN_14, me, player);
DoCast(player, 34883);
// below here is temporary workaround, to be removed when spell works properly
pPlayer->AreaExploredOrEventHappens(10277);
player->AreaExploredOrEventHappens(10277);
break;
}
}
@@ -244,24 +244,24 @@ class npc_marin_noggenfogger : public CreatureScript
public:
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)
pPlayer->GetSession()->SendListInventory(creature->GetGUID());
player->GetSession()->SendListInventory(creature->GetGUID());
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetQuestRewardStatus(2662))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (creature->isVendor() && player->GetQuestRewardStatus(2662))
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;
}
@@ -279,35 +279,35 @@ class npc_steward_of_time : public CreatureScript
public:
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
pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns)
player->CastSpell(player, 34891, true); //(Flight through Caverns)
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)
pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns)
player->CastSpell(player, 34891, true); //(Flight through Caverns)
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(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);
pPlayer->SEND_GOSSIP_MENU(9978, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(9978, creature->GetGUID());
}
else
pPlayer->SEND_GOSSIP_MENU(9977, creature->GetGUID());
player->SEND_GOSSIP_MENU(9977, creature->GetGUID());
return true;
}
@@ -330,48 +330,48 @@ class npc_stone_watcher_of_norgannon : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(1675, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(1675, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
pPlayer->SEND_GOSSIP_MENU(1676, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(1676, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
pPlayer->SEND_GOSSIP_MENU(1677, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(1677, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
pPlayer->SEND_GOSSIP_MENU(1678, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->SEND_GOSSIP_MENU(1678, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
pPlayer->SEND_GOSSIP_MENU(1679, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(1679, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(2954);
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(2954);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (player->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -403,7 +403,7 @@ class npc_OOX17 : public CreatureScript
public:
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)
{
@@ -414,7 +414,7 @@ public:
DoScriptText(SAY_OOX_START, creature);
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;
}
@@ -430,9 +430,9 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch(i) {
@@ -453,10 +453,10 @@ public:
break;
case 86:
if (pPlayer)
if (player)
{
DoScriptText(SAY_OOX_END, me);
pPlayer->GroupEventHappens(Q_OOX17, me);
player->GroupEventHappens(Q_OOX17, me);
}
break;
}
@@ -506,12 +506,12 @@ class npc_tooga : public CreatureScript
public:
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 (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;
@@ -549,10 +549,10 @@ public:
{
if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
{
if (Player* pPlayer = GetLeaderForFollower())
if (Player* player = GetLeaderForFollower())
{
if (pPlayer->GetQuestStatus(QUEST_TOOGA) == QUEST_STATUS_INCOMPLETE)
pPlayer->GroupEventHappens(QUEST_TOOGA, me);
if (player->GetQuestStatus(QUEST_TOOGA) == QUEST_STATUS_INCOMPLETE)
player->GroupEventHappens(QUEST_TOOGA, me);
}
TortaGUID = pWho->GetGUID();
src/server/scripts/Kalimdor/teldrassil.cpp
+5 -5
View File
@@ -48,12 +48,12 @@ class npc_mist : public CreatureScript
public:
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 (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;
@@ -88,10 +88,10 @@ public:
{
DoScriptText(EMOTE_AT_HOME, me);
if (Player* pPlayer = GetLeaderForFollower())
if (Player* player = GetLeaderForFollower())
{
if (pPlayer->GetQuestStatus(QUEST_MIST) == QUEST_STATUS_INCOMPLETE)
pPlayer->GroupEventHappens(QUEST_MIST, me);
if (player->GetQuestStatus(QUEST_MIST) == QUEST_STATUS_INCOMPLETE)
player->GroupEventHappens(QUEST_MIST, me);
}
//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:
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)
{
pPlayer->SEND_GOSSIP_MENU(3558, creature->GetGUID());
pPlayer->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
player->SEND_GOSSIP_MENU(3558, creature->GetGUID());
player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
}
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)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE)
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;
}
@@ -101,17 +101,17 @@ class npc_gilthares : public CreatureScript
public:
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)
{
creature->setFaction(FACTION_ESCORTEE);
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()))
pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest);
pEscortAI->Start(false, false, player->GetGUID(), pQuest);
}
return true;
}
@@ -129,31 +129,31 @@ public:
void WaypointReached(uint32 uiPointId)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch(uiPointId)
{
case 16:
DoScriptText(SAY_GIL_AT_LAST, me, pPlayer);
DoScriptText(SAY_GIL_AT_LAST, me, player);
break;
case 17:
DoScriptText(SAY_GIL_PROCEED, me, pPlayer);
DoScriptText(SAY_GIL_PROCEED, me, player);
break;
case 18:
DoScriptText(SAY_GIL_FREEBOOTERS, me, pPlayer);
DoScriptText(SAY_GIL_FREEBOOTERS, me, player);
break;
case 37:
DoScriptText(SAY_GIL_ALMOST, me, pPlayer);
DoScriptText(SAY_GIL_ALMOST, me, player);
break;
case 47:
DoScriptText(SAY_GIL_SWEET, me, pPlayer);
DoScriptText(SAY_GIL_SWEET, me, player);
break;
case 53:
DoScriptText(SAY_GIL_FREED, me, pPlayer);
pPlayer->GroupEventHappens(QUEST_FREE_FROM_HOLD, me);
DoScriptText(SAY_GIL_FREED, me, player);
player->GroupEventHappens(QUEST_FREE_FROM_HOLD, me);
break;
}
}
@@ -186,26 +186,26 @@ class npc_sputtervalve : public CreatureScript
public:
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)
{
pPlayer->SEND_GOSSIP_MENU(2013, creature->GetGUID());
pPlayer->AreaExploredOrEventHappens(6981);
player->SEND_GOSSIP_MENU(2013, creature->GetGUID());
player->AreaExploredOrEventHappens(6981);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (player->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -295,7 +295,7 @@ public:
DoMeleeAttackIfReady();
}
void ReceiveEmote(Player* /*pPlayer*/, uint32 emote)
void ReceiveEmote(Player* /*player*/, uint32 emote)
{
if (emote == TEXT_EMOTE_SALUTE)
{
@@ -592,9 +592,9 @@ public:
void WaypointReached(uint32 uiPointId)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch(uiPointId)
@@ -620,18 +620,18 @@ public:
void WaypointStart(uint32 uiPointId)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch(uiPointId)
{
case 9:
DoScriptText(SAY_STARTUP2, me, pPlayer);
DoScriptText(SAY_STARTUP2, me, player);
break;
case 18:
DoScriptText(SAY_PROGRESS_1, me, pPlayer);
DoScriptText(SAY_PROGRESS_1, me, player);
SetRun();
break;
}
@@ -666,9 +666,9 @@ public:
DoScriptText(SAY_END, me);
break;
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);
}
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)
{
creature->setFaction(FACTION_RATCHET);
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;
}
src/server/scripts/Kalimdor/thousand_needles.cpp
+27 -27
View File
@@ -54,12 +54,12 @@ class npc_kanati : public CreatureScript
public:
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 (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;
}
@@ -84,8 +84,8 @@ public:
DoSpawnGalak();
break;
case 1:
if (Player* pPlayer = GetPlayerForEscort())
pPlayer->GroupEventHappens(QUEST_PROTECT_KANATI, me);
if (Player* player = GetPlayerForEscort())
player->GroupEventHappens(QUEST_PROTECT_KANATI, me);
break;
}
}
@@ -142,15 +142,15 @@ class npc_lakota_windsong : public CreatureScript
public:
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)
{
DoScriptText(SAY_LAKO_START, creature, pPlayer);
DoScriptText(SAY_LAKO_START, creature, player);
creature->setFaction(FACTION_ESCORTEE_LAKO);
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;
}
@@ -183,8 +183,8 @@ public:
DoSpawnBandits(ID_AMBUSH_3);
break;
case 45:
if (Player* pPlayer = GetPlayerForEscort())
pPlayer->GroupEventHappens(QUEST_FREE_AT_LAST, me);
if (Player* player = GetPlayerForEscort())
player->GroupEventHappens(QUEST_FREE_AT_LAST, me);
break;
}
}
@@ -227,15 +227,15 @@ class npc_paoka_swiftmountain : public CreatureScript
public:
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)
{
DoScriptText(SAY_START, creature, pPlayer);
DoScriptText(SAY_START, creature, player);
creature->setFaction(FACTION_ESCORTEE);
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;
}
@@ -263,8 +263,8 @@ public:
DoScriptText(SAY_COMPLETE, me);
break;
case 27:
if (Player* pPlayer = GetPlayerForEscort())
pPlayer->GroupEventHappens(QUEST_HOMEWARD, me);
if (Player* player = GetPlayerForEscort())
player->GroupEventHappens(QUEST_HOMEWARD, me);
break;
}
}
@@ -299,24 +299,24 @@ class npc_plucky : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->CompleteQuest(QUEST_SCOOP);
player->CLOSE_GOSSIP_MENU();
player->CompleteQuest(QUEST_SCOOP);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(738, creature->GetGUID());
if (player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(738, creature->GetGUID());
return true;
}
@@ -346,9 +346,9 @@ public:
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)
{
@@ -408,16 +408,16 @@ class go_panther_cage : public GameObjectScript
public:
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))
{
panther->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
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:
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)
{
pPlayer->CastSpell(pPlayer, 23123, false);
pPlayer->SEND_GOSSIP_MENU(7014, creature->GetGUID());
player->CastSpell(player, 23123, false);
player->SEND_GOSSIP_MENU(7014, creature->GetGUID());
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(925) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HCB, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
if (player->GetQuestStatus(925) == QUEST_STATUS_INCOMPLETE)
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;
}
src/server/scripts/Kalimdor/ungoro_crater.cpp
+19 -19
View File
@@ -54,12 +54,12 @@ class npc_ame : public CreatureScript
public:
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)
{
CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, pPlayer->GetGUID());
DoScriptText(SAY_READY, creature, pPlayer);
CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID());
DoScriptText(SAY_READY, creature, player);
creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
// Change faction so mobs attack
creature->setFaction(113);
@@ -80,32 +80,32 @@ public:
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
Player* player = GetPlayerForEscort();
if (!pPlayer)
if (!player)
return;
switch (i)
{
case 19:
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;
case 28:
DoScriptText(SAY_SEARCH, me, pPlayer);
DoScriptText(SAY_SEARCH, me, player);
break;
case 38:
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;
case 49:
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;
case 55:
DoScriptText(SAY_FINISH, me, pPlayer);
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_CHASING_AME, me);
DoScriptText(SAY_FINISH, me, player);
if (player)
player->GroupEventHappens(QUEST_CHASING_AME, me);
break;
}
}
@@ -122,8 +122,8 @@ public:
void JustDied(Unit* /*killer*/)
{
if (Player* pPlayer = GetPlayerForEscort())
pPlayer->FailQuest(QUEST_CHASING_AME);
if (Player* player = GetPlayerForEscort())
player->FailQuest(QUEST_CHASING_AME);
}
void UpdateAI(const uint32 diff)
@@ -180,14 +180,14 @@ class npc_ringo : public CreatureScript
public:
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 (npc_ringoAI* pRingoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI()))
{
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 (Player* pPlayer = GetLeaderForFollower())
if (Player* player = GetLeaderForFollower())
{
if (pPlayer->GetQuestStatus(QUEST_A_LITTLE_HELP) == QUEST_STATUS_INCOMPLETE)
pPlayer->GroupEventHappens(QUEST_A_LITTLE_HELP, me);
if (player->GetQuestStatus(QUEST_A_LITTLE_HELP) == QUEST_STATUS_INCOMPLETE)
player->GroupEventHappens(QUEST_A_LITTLE_HELP, me);
}
SpraggleGUID = pWho->GetGUID();
src/server/scripts/Kalimdor/winterspring.cpp
+37 -37
View File
@@ -48,48 +48,48 @@ class npc_lorax : public CreatureScript
public:
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)
{
case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
pPlayer->SEND_GOSSIP_MENU(3759, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(3759, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
pPlayer->SEND_GOSSIP_MENU(3760, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(3760, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
pPlayer->SEND_GOSSIP_MENU(3761, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(3761, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
pPlayer->SEND_GOSSIP_MENU(3762, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(3762, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
pPlayer->SEND_GOSSIP_MENU(3763, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->SEND_GOSSIP_MENU(3763, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU();
pPlayer->AreaExploredOrEventHappens(5126);
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(5126);
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
if (player->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE)
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;
}
@@ -105,24 +105,24 @@ class npc_rivern_frostwind : public CreatureScript
public:
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)
pPlayer->GetSession()->SendListInventory(creature->GetGUID());
player->GetSession()->SendListInventory(creature->GetGUID());
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (creature->isVendor() && pPlayer->GetReputationRank(589) == REP_EXALTED)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (creature->isVendor() && player->GetReputationRank(589) == REP_EXALTED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
@@ -140,29 +140,29 @@ class npc_witch_doctor_mauari : public CreatureScript
public:
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)
{
pPlayer->CLOSE_GOSSIP_MENU();
creature->CastSpell(pPlayer, 16351, false);
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, 16351, false);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestRewardStatus(975))
if (player->GetQuestRewardStatus(975))
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(3377, creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(3377, creature->GetGUID());
}else
pPlayer->SEND_GOSSIP_MENU(3375, creature->GetGUID());
player->SEND_GOSSIP_MENU(3375, creature->GetGUID());
return true;
}