*Fix build.
--HG-- branch : trunk
This commit is contained in:
@@ -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;
|
||||
|
||||
+3
-3
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user