*Try to fix a bug that chain-cast far sight may cause crash.

--HG--
branch : trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index f3c4adbd805..81dac274b1c 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -443,6 +443,10 @@ Map::LoadGrid(const Cell& cell, bool no_unload)
         ObjectAccessor::Instance().AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this);
 
         setGridObjectDataLoaded(true,cell.GridX(), cell.GridY());
+        // Not sure if this is the reason that far sight cause crash
+        // Seems crash happens when trying to delete a far sight dynobj from an unopened grid
+        ResetGridExpiry(*getNGrid(cell.GridX(), cell.GridY()), 1.0f);
+        grid->SetGridState(GRID_STATE_ACTIVE);
         if(no_unload)
             getNGrid(cell.GridX(), cell.GridY())->setUnloadFlag(false);
     }