From 4b19153a79f70f1c816d084dda8eca1f666ac5dd Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 26 Feb 2009 10:42:37 -0600
Subject: *Fix a crash caused by far sight spells.

--HG--
branch : trunk
---
 src/game/Map.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/game/Map.cpp')

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);
-- 
cgit v1.2.3