diff options
| author | megamage <none@none> | 2009-02-22 19:17:09 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-22 19:17:09 -0600 |
| commit | 255736028fe93e1c5b5c39cab003bff6ab84c926 (patch) | |
| tree | 58af37cd7ed039a10088a1e1712539ef3f56b91d /src/bindings/scripts | |
| parent | acfbe7a4a36d2ecb567633d25f776be835fd7854 (diff) | |
| parent | 200f9b11c6b88733b7b385ddce8d2b6164ca557e (diff) | |
*Fix build.
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index 36bff1796e6..757bf6141e7 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -721,7 +721,7 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI if(!plr || !Illi) { EnterEvadeMode(); - return; + return 0; } switch(Step) @@ -809,13 +809,16 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI case 32: m_creature->GetMotionMaster()->MovePoint(0, -5085.77, 577.231, 86.6719); return 5000; break; case 33: Reset(); return 100; break; - default : return 9999999; + default : return 0; } } void UpdateAI(const uint32 diff) { - if(ConversationTimer < diff) + if(!ConversationTimer) + return; + + if(ConversationTimer <= diff) { if(Event && IllidanGUID && PlayerGUID) { |