aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-26 13:06:42 -0600
committermegamage <none@none>2009-02-26 13:06:42 -0600
commitff24a59dd54942c6ed7d92e4302c23e9f31598f8 (patch)
tree81e166ef93971dfa38b3de2aa9053b2227838ec1
parent80490865cc8037c7866cbce1853f1ec5aeae764a (diff)
*Fix build.
--HG-- branch : trunk
-rw-r--r--src/framework/GameSystem/Grid.h4
-rw-r--r--src/game/Map.cpp6
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);
}