From 200f9b11c6b88733b7b385ddce8d2b6164ca557e Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sun, 22 Feb 2009 19:15:07 -0600
Subject: *Fix build.

--HG--
branch : trunk
---
 .../scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp | 9 ++++++---
 src/game/Map.cpp                                                 | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

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 d5035d2cfc1..1a7e6b655e8 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)
             {
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index a17604f5dd5..cb072d93e8d 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -321,7 +321,7 @@ void Map::SwitchGridContainers(T* obj, bool apply)
 
     if(apply)
     {
-        assert(!grid.GetWorldObject(obj->GetGUID(), obj))
+        assert(!grid.GetWorldObject(obj->GetGUID(), obj));
         {
             grid.RemoveGridObject<T>(obj, obj->GetGUID());
             grid.AddWorldObject<T>(obj, obj->GetGUID());
@@ -329,7 +329,7 @@ void Map::SwitchGridContainers(T* obj, bool apply)
     }
     else
     {
-        assert(!grid.GetGridObject(obj->GetGUID(), obj))
+        assert(!grid.GetGridObject(obj->GetGUID(), obj));
         {
             grid.RemoveWorldObject<T>(obj, obj->GetGUID());
             grid.AddGridObject<T>(obj, obj->GetGUID());
-- 
cgit v1.2.3