Fix compile.

(Not a good idea to test something and push another file)

--HG--
branch : trunk
This commit is contained in:
Spp
2010-04-30 18:06:26 +02:00
parent 9aa4405a5a
commit e782acfca3
+30 -30
View File
@@ -113,26 +113,26 @@ struct npc_inquisitor_hallardAI : public npc_escortAI
Player* pPlayer = GetPlayerForEscort(); Player* pPlayer = GetPlayerForEscort();
if (!pPlayer) if (!pPlayer)
return; return;
Creature* Godfrey = m_creature->FindNearestCreature(NPC_GODFREY, 50, true); Creature* Godfrey = me->FindNearestCreature(NPC_GODFREY, 50, true);
if (!Godfrey) if (!Godfrey)
return; return;
switch (i) switch (i)
{ {
case 1: case 1:
DoScriptText(SAY_WP_1, m_creature, Godfrey); DoScriptText(SAY_WP_1, me, Godfrey);
m_creature->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID()); me->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID());
m_creature->HandleEmoteCommand(5); me->HandleEmoteCommand(5);
m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
break; break;
case 2: case 2:
Godfrey->HandleEmoteCommand(434); Godfrey->HandleEmoteCommand(434);
DoScriptText(SAY_WP_2, m_creature, Godfrey); DoScriptText(SAY_WP_2, me, Godfrey);
m_creature->HandleEmoteCommand(15); me->HandleEmoteCommand(15);
break; break;
case 3: case 3:
DoScriptText(SAY_WP_3, m_creature, Godfrey); DoScriptText(SAY_WP_3, me, Godfrey);
m_creature->HandleEmoteCommand(1); me->HandleEmoteCommand(1);
break; break;
case 4: case 4:
DoScriptText(SAY_WP_4, Godfrey); DoScriptText(SAY_WP_4, Godfrey);
@@ -144,19 +144,19 @@ struct npc_inquisitor_hallardAI : public npc_escortAI
DoScriptText(SAY_WP_6, Godfrey); DoScriptText(SAY_WP_6, Godfrey);
break; break;
case 7: case 7:
DoScriptText(SAY_WP_7, m_creature, Godfrey); DoScriptText(SAY_WP_7, me, Godfrey);
m_creature->HandleEmoteCommand(1); me->HandleEmoteCommand(1);
break; break;
case 8: case 8:
DoScriptText(SAY_WP_8, m_creature, Godfrey); DoScriptText(SAY_WP_8, me, Godfrey);
m_creature->HandleEmoteCommand(16); me->HandleEmoteCommand(16);
break; break;
case 9: case 9:
DoScriptText(SAY_WP_9, m_creature, Godfrey); DoScriptText(SAY_WP_9, me, Godfrey);
m_creature->HandleEmoteCommand(5); me->HandleEmoteCommand(5);
break; break;
case 10: case 10:
DoScriptText(SAY_WP_10, m_creature, Godfrey); DoScriptText(SAY_WP_10, me, Godfrey);
DoCast(Godfrey, SPELL_HOLY_FIRE); DoCast(Godfrey, SPELL_HOLY_FIRE);
break; break;
case 11: case 11:
@@ -164,11 +164,11 @@ struct npc_inquisitor_hallardAI : public npc_escortAI
DoScriptText(SAY_WP_11, Godfrey); DoScriptText(SAY_WP_11, Godfrey);
break; break;
case 12: case 12:
DoScriptText(SAY_WP_12, m_creature, Godfrey); DoScriptText(SAY_WP_12, me, Godfrey);
DoCast(Godfrey, SPELL_HOLY_FIRE); DoCast(Godfrey, SPELL_HOLY_FIRE);
break; break;
case 13: case 13:
DoScriptText(SAY_WP_13, m_creature, Godfrey); DoScriptText(SAY_WP_13, me, Godfrey);
DoCast(Godfrey, SPELL_HOLY_FIRE); DoCast(Godfrey, SPELL_HOLY_FIRE);
break; break;
case 14: case 14:
@@ -176,20 +176,20 @@ struct npc_inquisitor_hallardAI : public npc_escortAI
DoScriptText(SAY_WP_14, Godfrey); DoScriptText(SAY_WP_14, Godfrey);
break; break;
case 15: case 15:
DoScriptText(SAY_WP_15, m_creature, Godfrey); DoScriptText(SAY_WP_15, me, Godfrey);
DoCast(Godfrey, SPELL_HOLY_FIRE); DoCast(Godfrey, SPELL_HOLY_FIRE);
break; break;
case 16: case 16:
DoScriptText(SAY_WP_16, m_creature, Godfrey); DoScriptText(SAY_WP_16, me, Godfrey);
break; break;
case 17: case 17:
DoScriptText(SAY_WP_17, m_creature, Godfrey); DoScriptText(SAY_WP_17, me, Godfrey);
break; break;
case 18: case 18:
DoScriptText(SAY_WP_18, Godfrey); DoScriptText(SAY_WP_18, Godfrey);
break; break;
case 19: case 19:
DoScriptText(SAY_WP_19, m_creature, Godfrey); DoScriptText(SAY_WP_19, me, Godfrey);
break; break;
case 20: case 20:
DoScriptText(SAY_WP_20, Godfrey); DoScriptText(SAY_WP_20, Godfrey);
@@ -198,7 +198,7 @@ struct npc_inquisitor_hallardAI : public npc_escortAI
DoScriptText(SAY_WP_21, Godfrey); DoScriptText(SAY_WP_21, Godfrey);
break; break;
case 22: case 22:
DoScriptText(SAY_WP_22, m_creature, Godfrey); DoScriptText(SAY_WP_22, me, Godfrey);
break; break;
case 23: case 23:
DoScriptText(SAY_WP_23, Godfrey); DoScriptText(SAY_WP_23, Godfrey);
@@ -207,18 +207,18 @@ struct npc_inquisitor_hallardAI : public npc_escortAI
DoScriptText(SAY_WP_24, Godfrey); DoScriptText(SAY_WP_24, Godfrey);
break; break;
case 25: case 25:
DoScriptText(SAY_WP_25, m_creature, Godfrey); DoScriptText(SAY_WP_25, me, Godfrey);
break; break;
case 26: case 26:
DoScriptText(SAY_WP_26, m_creature); DoScriptText(SAY_WP_26, me);
m_creature->SetUInt64Value(UNIT_FIELD_TARGET, pPlayer->GetGUID()); me->SetUInt64Value(UNIT_FIELD_TARGET, pPlayer->GetGUID());
break; break;
case 27: case 27:
DoScriptText(SAY_WP_27, m_creature, Godfrey); DoScriptText(SAY_WP_27, me, Godfrey);
m_creature->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID()); me->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID());
Completed = true; Completed = true;
if (pPlayer) if (pPlayer)
pPlayer->GroupEventHappens(QUEST_A_RIGHTEOUS_SERMON, m_creature); pPlayer->GroupEventHappens(QUEST_A_RIGHTEOUS_SERMON, me);
break; break;
} }
} }