*Fix a crash caused by far sight spells.

--HG--
branch : trunk

2 files changed, 5 insertions, 6 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 6934bcf3df1..2e81d651d8b 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -844,10 +844,9 @@ Map::Remove(T *obj, bool remove)
     NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
     assert( grid != NULL );
 
+    obj->RemoveFromWorld();
     if(obj->isActiveObject())
         RemoveFromActive(obj);
-
-    obj->RemoveFromWorld();
     RemoveFromGrid(obj,grid,cell);
 
     UpdateObjectVisibility(obj,cell,p);
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 5551f844376..f35b392991e 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1082,9 +1082,9 @@ void WorldObject::setActive( bool on )
     {
         map = GetMap();
         if(GetTypeId() == TYPEID_UNIT)
-            map->Remove((Creature*)this,false);
+            map->RemoveFromActive((Creature*)this);
         else if(GetTypeId() == TYPEID_DYNAMICOBJECT)
-            map->Remove((DynamicObject*)this,false);
+            map->RemoveFromActive((DynamicObject*)this);
     }
 
     m_isActive = on;
@@ -1092,9 +1092,9 @@ void WorldObject::setActive( bool on )
     if(world)
     {
         if(GetTypeId() == TYPEID_UNIT)
-            map->Add((Creature*)this);
+            map->AddToActive((Creature*)this);
         else if(GetTypeId() == TYPEID_DYNAMICOBJECT)
-            map->Add((DynamicObject*)this);
+            map->AddToActive((DynamicObject*)this);
     }
 }