Core/Script: Code style and remove unused core.

Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-28 15:15:48 +08:00
parent e050945c91
commit a20fa23ea6
27 changed files with 193 additions and 192 deletions
@@ -1876,8 +1876,7 @@ public:
me->SetPhaseMask(1, true);
DoScriptText(SAY_5, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
if (player)
player->GroupEventHappens(QUEST_ESCAPING_THE_MIST, me);
player->GroupEventHappens(QUEST_ESCAPING_THE_MIST, me);
SetRun(true);
break;
}
@@ -79,6 +79,7 @@ public:
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
{
case 9:
@@ -102,6 +102,7 @@ public:
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
{
case 1:
@@ -109,8 +110,7 @@ public:
SetRun(true);
break;
case 23:
if (player)
player->GroupEventHappens(QUEST_TRAIL_OF_FIRE, me);
player->GroupEventHappens(QUEST_TRAIL_OF_FIRE, me);
me->DespawnOrUnsummon();
break;
case 5:
@@ -113,8 +113,8 @@ public:
if (Player* player = GetPlayerForEscort())
{
if (player->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTANDINGS) != QUEST_STATUS_COMPLETE)
player->FailQuest(QUEST_FORTUNATE_MISUNDERSTANDINGS);
if (player->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTANDINGS) != QUEST_STATUS_COMPLETE)
player->FailQuest(QUEST_FORTUNATE_MISUNDERSTANDINGS);
}
}
};
@@ -401,12 +401,12 @@ public:
{
m_uiChatTimer = 4000;
}
void JustDied(Unit* /*killer*/)
{
Player* player = GetPlayerForEscort();
if (HasEscortState(STATE_ESCORT_ESCORTING))
{
if (player)
if (Player* player = GetPlayerForEscort())
player->FailQuest(QUEST_DISASTER);
}
}
+9 -6
View File
@@ -377,15 +377,18 @@ public:
void WaypointReached(uint32 i)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
{
case 26:
DoScriptText(SAY_END_WP_REACHED, me, player);
break;
case 27:
if (player)
case 26:
DoScriptText(SAY_END_WP_REACHED, me, player);
break;
case 27:
player->GroupEventHappens(QUEST_BITTER_DEPARTURE, me);
break;
break;
}
}