josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix build.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-26 13:06:42 -06:00
parent 80490865cc
commit ff24a59dd5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/framework/GameSystem/Grid.h
+2 -2
View File
@@ -130,7 +130,7 @@ class TRINITY_DLL_DECL Grid
return i_container.template remove<SPECIFIC_OBJECT>(obj, hdl); return i_container.template remove<SPECIFIC_OBJECT>(obj, hdl);
} }
bool NoWorldObjectInGrid() const /*bool NoWorldObjectInGrid() const
{ {
return i_objects.GetElements().isEmpty(); return i_objects.GetElements().isEmpty();
} }
@@ -138,7 +138,7 @@ class TRINITY_DLL_DECL Grid
bool NoGridObjectInGrid() const bool NoGridObjectInGrid() const
{ {
return i_container.GetElements().isEmpty(); return i_container.GetElements().isEmpty();
} }*/
private: private:
typedef typename ThreadModel::Lock Guard; typedef typename ThreadModel::Lock Guard;
src/game/Map.cpp
+3 -3
View File
@@ -1102,10 +1102,10 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll)
else else
RemoveAllObjectsInRemoveList(); RemoveAllObjectsInRemoveList();
assert(grid.NoWorldObjectInGrid()); //assert(grid.NoWorldObjectInGrid());
unloader.UnloadN(); unloader.UnloadN();
assert(grid.NoWorldObjectInGrid()); //assert(grid.NoWorldObjectInGrid());
assert(grid.NoGridObjectInGrid()); //assert(grid.NoGridObjectInGrid());
delete grid; delete grid;
setNGrid(NULL, x, y); setNGrid(NULL, x, y);
} }