diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/framework/GameSystem/Grid.h | 4 | ||||
| -rw-r--r-- | src/game/Map.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h index a617e61904b..06c4dde2ed3 100644 --- a/src/framework/GameSystem/Grid.h +++ b/src/framework/GameSystem/Grid.h @@ -130,7 +130,7 @@ class TRINITY_DLL_DECL Grid return i_container.template remove<SPECIFIC_OBJECT>(obj, hdl); } - bool NoWorldObjectInGrid() const + /*bool NoWorldObjectInGrid() const { return i_objects.GetElements().isEmpty(); } @@ -138,7 +138,7 @@ class TRINITY_DLL_DECL Grid bool NoGridObjectInGrid() const { return i_container.GetElements().isEmpty(); - } + }*/ private: typedef typename ThreadModel::Lock Guard; diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 2e81d651d8b..d40c341fd47 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1102,10 +1102,10 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll) else RemoveAllObjectsInRemoveList(); - assert(grid.NoWorldObjectInGrid()); + //assert(grid.NoWorldObjectInGrid()); unloader.UnloadN(); - assert(grid.NoWorldObjectInGrid()); - assert(grid.NoGridObjectInGrid()); + //assert(grid.NoWorldObjectInGrid()); + //assert(grid.NoGridObjectInGrid()); delete grid; setNGrid(NULL, x, y); } |