Revert "Temp fix for *nix build."
It builds in *nix without this patch.
This reverts commit e84fffe588.
This commit is contained in:
@@ -31,7 +31,7 @@ void ActiveState::Update(Map &m, NGridType &grid, GridInfo & info, const uint32
|
||||
info.UpdateTimeTracker(t_diff);
|
||||
if (info.getTimeTracker().Passed())
|
||||
{
|
||||
if (!grid.GetPlayerCountInNGrid() && !m.ActiveObjectsNearGrid(grid))
|
||||
if (!grid.GetWorldObjectCountInNGrid<Player>() && !m.ActiveObjectsNearGrid(grid))
|
||||
{
|
||||
ObjectGridStoper worker;
|
||||
TypeContainerVisitor<ObjectGridStoper, GridTypeMapContainer> visitor(worker);
|
||||
|
||||
@@ -171,8 +171,6 @@ class NGrid
|
||||
}
|
||||
*/
|
||||
|
||||
//TODO: This does not compile in *nix. Hope somebody can find out how to write such template function.
|
||||
/*
|
||||
template<class T>
|
||||
uint32 GetWorldObjectCountInNGrid() const
|
||||
{
|
||||
@@ -182,26 +180,6 @@ class NGrid
|
||||
count += i_cells[x][y].template GetWorldObjectCountInGrid<T>();
|
||||
return count;
|
||||
}
|
||||
*/
|
||||
|
||||
//These two temporarily replace GetWorldObjectCountInNGrid
|
||||
uint32 GetPlayerCountInNGrid() const
|
||||
{
|
||||
uint32 count = 0;
|
||||
for (uint32 x = 0; x < N; ++x)
|
||||
for (uint32 y = 0; y < N; ++y)
|
||||
count += i_cells[x][y].GetWorldObjectCountInGrid<Player>();
|
||||
return count;
|
||||
}
|
||||
|
||||
uint32 GetWorldCreatureCountInNGrid() const
|
||||
{
|
||||
uint32 count = 0;
|
||||
for (uint32 x = 0; x < N; ++x)
|
||||
for (uint32 y = 0; y < N; ++y)
|
||||
count += i_cells[x][y].GetWorldObjectCountInGrid<Creature>();
|
||||
return count;
|
||||
}
|
||||
|
||||
private:
|
||||
uint32 i_gridId;
|
||||
|
||||
Reference in New Issue
Block a user