*fix Al'ar stuck bug

--HG--
branch : trunk
This commit is contained in:
Rat
2009-04-07 13:08:27 +02:00
parent d4f763f2f6
commit 89d7644822
@@ -90,6 +90,8 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
float DefaultMoveSpeedRate; float DefaultMoveSpeedRate;
bool Phase1; bool Phase1;
bool ForceMove;
uint32 ForceTimer;
int8 cur_wp; int8 cur_wp;
@@ -105,6 +107,8 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
WaitEvent = WE_NONE; WaitEvent = WE_NONE;
WaitTimer = 0; WaitTimer = 0;
AfterMoving = false; AfterMoving = false;
ForceMove = false;
ForceTimer = 5000;
cur_wp = 4; cur_wp = 4;
@@ -189,6 +193,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
{ {
WaitTimer = 1; WaitTimer = 1;
AfterMoving = true; AfterMoving = true;
ForceMove = false;
} }
} }
@@ -203,6 +208,15 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
Berserk_Timer = 60000; Berserk_Timer = 60000;
}else Berserk_Timer -= diff; }else Berserk_Timer -= diff;
if(ForceMove)
{
if(ForceTimer < diff)
{
m_creature->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]);
ForceTimer = 5000;
}else ForceTimer -= diff;
}
if(WaitEvent) if(WaitEvent)
{ {
if(WaitTimer) if(WaitTimer)
@@ -320,6 +334,8 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
WaitEvent = WE_QUILL; WaitEvent = WE_QUILL;
} }
} }
ForceMove = true;
ForceTimer = 5000;
m_creature->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]); m_creature->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]);
WaitTimer = 0; WaitTimer = 0;
return; return;