diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp | 9 | ||||
| -rw-r--r-- | src/game/Map.cpp | 4 |
2 files changed, 8 insertions, 5 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) { diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 06685247688..ac4a6fd18df 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()); |