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

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

Browse Source
This commit is contained in:
click
2011-07-02 22:52:42 +02:00
parent f91ee24184
commit 169f5da8c3
134 changed files with 4039 additions and 4039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+22 -22
View File
@@ -313,12 +313,12 @@ class go_acherus_soul_prison : public GameObjectScript
public:
go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { }
bool OnGossipHello(Player* pPlayer, GameObject* pGo)
bool OnGossipHello(Player* player, GameObject* pGo)
{
if (Creature* anchor = pGo->FindNearestCreature(29521, 15))
if (uint64 prisonerGUID = anchor->AI()->GetGUID())
if (Creature* prisoner = Creature::GetCreature(*pPlayer, prisonerGUID))
CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, pPlayer);
if (Creature* prisoner = Creature::GetCreature(*player, prisonerGUID))
CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, player);
return false;
}
@@ -362,14 +362,14 @@ class npc_death_knight_initiate : public CreatureScript
public:
npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { }
bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
{
pPlayer->PlayerTalkClass->ClearMenus();
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF)
{
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
if (pPlayer->isInCombat() || creature->isInCombat())
if (player->isInCombat() || creature->isInCombat())
return true;
if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiate::npc_death_knight_initiateAI, creature->AI()))
@@ -382,26 +382,26 @@ public:
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15);
int32 uiSayId = rand()% (sizeof(m_auiRandomSay)/sizeof(int32));
DoScriptText(m_auiRandomSay[uiSayId], creature, pPlayer);
DoScriptText(m_auiRandomSay[uiSayId], creature, player);
pPlayer->CastSpell(creature, SPELL_DUEL, false);
pPlayer->CastSpell(pPlayer, SPELL_DUEL_FLAG, true);
player->CastSpell(creature, SPELL_DUEL, false);
player->CastSpell(player, SPELL_DUEL_FLAG, true);
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (pPlayer->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth())
if (player->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth())
{
if (pPlayer->HealthBelowPct(10))
if (player->HealthBelowPct(10))
return true;
if (pPlayer->isInCombat() || creature->isInCombat())
if (player->isInCombat() || creature->isInCombat())
return true;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
}
return true;
}
@@ -1057,20 +1057,20 @@ class go_inconspicuous_mine_car : public GameObjectScript
public:
go_inconspicuous_mine_car() : GameObjectScript("go_inconspicuous_mine_car") { }
bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/)
bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE)
if (player->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE)
{
// Hack Why Trinity Dont Support Custom Summon Location
if (Creature* miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1))
if (Creature* miner = player->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, player->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1))
{
pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true);
if (Creature* car = pPlayer->GetVehicleCreatureBase())
player->CastSpell(player, SPELL_CART_SUMM, true);
if (Creature* car = player->GetVehicleCreatureBase())
{
if (car->GetEntry() == 28817)
{
car->AI()->SetGUID(miner->GetGUID());
CAST_AI(npc_scarlet_miner::npc_scarlet_minerAI, miner->AI())->InitCartQuest(pPlayer);
CAST_AI(npc_scarlet_miner::npc_scarlet_minerAI, miner->AI())->InitCartQuest(player);
} else sLog->outError("TSCR: OnGossipHello vehicle entry is not correct.");
} else sLog->outError("TSCR: OnGossipHello player is not on the vehicle.");
} else sLog->outError("TSCR: OnGossipHello Scarlet Miner cant be found by script.");
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+122 -122
View File
@@ -102,8 +102,8 @@ public:
{
if (uiSpeech_timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(*me, uiPlayerGUID);
if (!pPlayer)
Player* player = Unit::GetPlayer(*me, uiPlayerGUID);
if (!player)
{
EnterEvadeMode();
return;
@@ -115,13 +115,13 @@ public:
case 2: DoScriptText(SAY_PERSUADED2, me); uiSpeech_timer = 8000; break;
case 3: DoScriptText(SAY_PERSUADED3, me); uiSpeech_timer = 8000; break;
case 4: DoScriptText(SAY_PERSUADED4, me); uiSpeech_timer = 8000; break;
case 5: DoScriptText(SAY_PERSUADED5, pPlayer); uiSpeech_timer = 8000; break;
case 5: DoScriptText(SAY_PERSUADED5, player); uiSpeech_timer = 8000; break;
case 6: DoScriptText(SAY_PERSUADED6, me);
pPlayer->Kill(me);
player->Kill(me);
//me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
//me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
uiSpeech_counter = 0;
pPlayer->GroupEventHappens(12720, me);
player->GroupEventHappens(12720, me);
return;
}
@@ -177,14 +177,14 @@ class npc_koltira_deathweaver : public CreatureScript
public:
npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { }
bool OnQuestAccept(Player* pPlayer, Creature* creature, const Quest* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
{
if (pQuest->GetQuestId() == QUEST_BREAKOUT)
{
creature->SetStandState(UNIT_STAND_STATE_STAND);
if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, creature->AI()))
pEscortAI->Start(false, false, pPlayer->GetGUID());
pEscortAI->Start(false, false, player->GetGUID());
}
return true;
}
@@ -255,9 +255,9 @@ public:
void JustSummoned(Creature* pSummoned)
{
if (Player* pPlayer = GetPlayerForEscort())
if (Player* player = GetPlayerForEscort())
{
pSummoned->AI()->AttackStart(pPlayer);
pSummoned->AI()->AttackStart(player);
}
if (pSummoned->GetEntry() == NPC_HIGH_INQUISITOR_VALROTH)
@@ -608,48 +608,48 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
bool MeetQuestCondition(Unit* pPlayer)
bool MeetQuestCondition(Unit* player)
{
switch(me->GetEntry())
{
case 29061: // Ellen Stanbridge
if (CAST_PLR(pPlayer)->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29072: // Kug Ironjaw
if (CAST_PLR(pPlayer)->GetQuestStatus(12748) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12748) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29067: // Donovan Pulfrost
if (CAST_PLR(pPlayer)->GetQuestStatus(12744) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12744) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29065: // Yazmina Oakenthorn
if (CAST_PLR(pPlayer)->GetQuestStatus(12743) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12743) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29071: // Antoine Brack
if (CAST_PLR(pPlayer)->GetQuestStatus(12750) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12750) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29032: // Malar Bravehorn
if (CAST_PLR(pPlayer)->GetQuestStatus(12739) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12739) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29068: // Goby Blastenheimer
if (CAST_PLR(pPlayer)->GetQuestStatus(12745) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12745) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29073: // Iggy Darktusk
if (CAST_PLR(pPlayer)->GetQuestStatus(12749) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12749) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29074: // Lady Eonys
if (CAST_PLR(pPlayer)->GetQuestStatus(12747) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12747) == QUEST_STATUS_INCOMPLETE)
return true;
break;
case 29070: // Valok the Righteous
if (CAST_PLR(pPlayer)->GetQuestStatus(12746) == QUEST_STATUS_INCOMPLETE)
if (CAST_PLR(player)->GetQuestStatus(12746) == QUEST_STATUS_INCOMPLETE)
return true;
break;
}
@@ -672,9 +672,9 @@ public:
{
if (ExecuteSpeech_Timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer)
if (!player)
{
Reset();
return;
@@ -682,29 +682,29 @@ public:
//TODO: simplify text's selection
switch(pPlayer->getRace())
switch(player->getRace())
{
case RACE_HUMAN:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_5, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_5, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_7, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_5, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_5, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_7, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_6, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_6, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -715,24 +715,24 @@ public:
case RACE_ORC:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_6, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_7, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_8, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_6, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_7, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_8, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_8, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_8, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -743,24 +743,24 @@ public:
case RACE_DWARF:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_2, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_2, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_2, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_3, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_2, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_5, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_2, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_2, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_3, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_2, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_5, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_2, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_3, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_3, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -771,24 +771,24 @@ public:
case RACE_NIGHTELF:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_5, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_6, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_2, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_5, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_6, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_2, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_7, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_7, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -799,24 +799,24 @@ public:
case RACE_UNDEAD_PLAYER:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_3, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_4, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_3, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_1, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_3, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_3, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_4, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_3, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_1, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_3, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_4, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_4, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -827,24 +827,24 @@ public:
case RACE_TAUREN:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_5, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_8, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_9, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_5, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_8, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_9, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_9, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_9, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -855,24 +855,24 @@ public:
case RACE_GNOME:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_4, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_4, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_6, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_4, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_4, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_6, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_5, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_5, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -883,24 +883,24 @@ public:
case RACE_TROLL:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_3, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_3, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_7, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_2, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_6, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_9, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_10, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_4, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_7, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_2, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_6, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_9, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_10, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_4, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_10, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_10, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -911,24 +911,24 @@ public:
case RACE_BLOODELF:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_1, me, player); break;
//case 5: //unknown
case 6: DoScriptText(SAY_EXEC_THINK_3, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_3, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_1, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_1, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
@@ -939,24 +939,24 @@ public:
case RACE_DRAENEI:
switch(ExecuteSpeech_Counter)
{
case 0: DoScriptText(SAY_EXEC_START_1, me, pPlayer); break;
case 0: DoScriptText(SAY_EXEC_START_1, me, player); break;
case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, pPlayer); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, pPlayer); break;
case 4: DoScriptText(SAY_EXEC_RECOG_2, me, pPlayer); break;
case 5: DoScriptText(SAY_EXEC_NOREM_1, me, pPlayer); break;
case 6: DoScriptText(SAY_EXEC_THINK_4, me, pPlayer); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, pPlayer); break;
case 2: DoScriptText(SAY_EXEC_PROG_1, me, player); break;
case 3: DoScriptText(SAY_EXEC_NAME_1, me, player); break;
case 4: DoScriptText(SAY_EXEC_RECOG_2, me, player); break;
case 5: DoScriptText(SAY_EXEC_NOREM_1, me, player); break;
case 6: DoScriptText(SAY_EXEC_THINK_4, me, player); break;
case 7: DoScriptText(SAY_EXEC_LISTEN_1, me, player); break;
case 8:
if (Creature* Plaguefist = GetClosestCreatureWithEntry(me, NPC_PLAGUEFIST, 85.0f))
DoScriptText(SAY_PLAGUEFIST, Plaguefist, pPlayer);
DoScriptText(SAY_PLAGUEFIST, Plaguefist, player);
break;
case 9:
DoScriptText(SAY_EXEC_TIME_2, me, pPlayer);
DoScriptText(SAY_EXEC_TIME_2, me, player);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, pPlayer); break;
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
case 11:
DoScriptText(EMOTE_DIES, me);
me->setDeathState(JUST_DIED);
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+11 -11
View File
@@ -242,8 +242,8 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state)
{
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* pPlayer = itr->getSource())
pPlayer->SendUpdateWorldState(id, state);
if (Player* player = itr->getSource())
player->SendUpdateWorldState(id, state);
}
}
}
@@ -287,29 +287,29 @@ class npc_highlord_darion_mograine : public CreatureScript
public:
npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { }
bool OnGossipSelect(Player* pPlayer, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
{
pPlayer->PlayerTalkClass->ClearMenus();
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
{
case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU();
player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->uiStep = 1;
CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->Start(true, false, pPlayer->GetGUID());
CAST_AI(npc_highlord_darion_mograine::npc_highlord_darion_mograineAI, creature->AI())->Start(true, false, player->GetGUID());
break;
}
return true;
}
bool OnGossipHello(Player* pPlayer, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature)
{
if (creature->isQuestGiver())
pPlayer->PrepareQuestMenu(creature->GetGUID());
player->PrepareQuestMenu(creature->GetGUID());
if (pPlayer->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE)
pPlayer->ADD_GOSSIP_ITEM(0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (player->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID());
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}