*Change "if" in SwitchGridContainers to assert.

--HG--
branch : trunk

1 files changed, 4 insertions, 4 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index b3006709556..a17604f5dd5 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -312,16 +312,16 @@ void Map::RemoveFromGrid(Creature* obj, NGridType *grid, Cell const& cell)
 }
 
 template<class T>
-void Map::SwitchGridContainers(T* obj, bool active)
+void Map::SwitchGridContainers(T* obj, bool apply)
 {
     CellPair pair = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
     Cell cell(pair);
     NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY());
     GridType &grid = (*ngrid)(cell.CellX(), cell.CellY());
 
-    if (active)
+    if(apply)
     {
-        if (!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 active)
     }
     else
     {
-        if (!grid.GetGridObject(obj->GetGUID(), obj))
+        assert(!grid.GetGridObject(obj->GetGUID(), obj))
         {
             grid.RemoveWorldObject<T>(obj, obj->GetGUID());
             grid.AddGridObject<T>(obj, obj->GetGUID());