Core: Cleaning up hungarian notation - Phase2: pPlayer -> player
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user