Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 03:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Change "if" in SwitchGridContainers to assert.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-22 17:13:11 -06:00
parent 9bb7807935
commit 90d5e05aaf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/Map.cpp
View File

@@ -312,16 +312,16 @@ void Map::RemoveFromGrid(Creature* obj, NGridType *grid, Cell const& cell)
}
template<class T>
void Map::SwitchGridContainers(T* obj, bool active)
void Map::SwitchGridContainers(T* obj, bool apply)
{
CellPair pair = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
Cell cell(pair);
NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY());
GridType &grid = (*ngrid)(cell.CellX(), cell.CellY());
if (active)
if(apply)
{
if (!grid.GetWorldObject(obj->GetGUID(), obj))
assert(!grid.GetWorldObject(obj->GetGUID(), obj))
{
grid.RemoveGridObject<T>(obj, obj->GetGUID());
grid.AddWorldObject<T>(obj, obj->GetGUID());
@@ -329,7 +329,7 @@ void Map::SwitchGridContainers(T* obj, bool active)
}
else
{
if (!grid.GetGridObject(obj->GetGUID(), obj))
assert(!grid.GetGridObject(obj->GetGUID(), obj))
{
grid.RemoveWorldObject<T>(obj, obj->GetGUID());
grid.AddGridObject<T>(obj, obj->GetGUID());