mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9307] Grid containers, cleanup

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
SilverIce 2010-02-05 01:16:10 +03:00 • committed by VladimirMangos
parent aac24092c2
commit 0c8fccbd47
9 changed files with 48 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/game/Map.cpp
View file

@ -234,13 +234,13 @@ void Map::InitVisibilityDistance()
template<class T>
void Map::AddToGrid(T* obj, NGridType *grid, Cell const& cell)
{
(*grid)(cell.CellX(), cell.CellY()).template AddGridObject<T>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).template AddGridObject<T>(obj);
}
template<>
void Map::AddToGrid(Player* obj, NGridType *grid, Cell const& cell)
{
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject(obj);
}
template<>
@ -249,12 +249,12 @@ void Map::AddToGrid(Corpse *obj, NGridType *grid, Cell const& cell)
// add to world object registry in grid
if(obj->GetType()!=CORPSE_BONES)
{
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject(obj);
}
// add to grid object store
else
{
(*grid)(cell.CellX(), cell.CellY()).AddGridObject(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).AddGridObject(obj);
}
}
@ -264,13 +264,13 @@ void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell)
// add to world object registry in grid
if(obj->isPet() || obj->isVehicle())
{
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject<Creature>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject<Creature>(obj);
obj->SetCurrentCell(cell);
}
// add to grid object store
else
{
(*grid)(cell.CellX(), cell.CellY()).AddGridObject<Creature>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).AddGridObject<Creature>(obj);
obj->SetCurrentCell(cell);
}
}
@ -278,13 +278,13 @@ void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell)
template<class T>
void Map::RemoveFromGrid(T* obj, NGridType *grid, Cell const& cell)
{
(*grid)(cell.CellX(), cell.CellY()).template RemoveGridObject<T>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).template RemoveGridObject<T>(obj);
}
template<>
void Map::RemoveFromGrid(Player* obj, NGridType *grid, Cell const& cell)
{
(*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject(obj);
}
template<>
@ -293,12 +293,12 @@ void Map::RemoveFromGrid(Corpse *obj, NGridType *grid, Cell const& cell)
// remove from world object registry in grid
if(obj->GetType()!=CORPSE_BONES)
{
(*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject(obj);
}
// remove from grid object store
else
{
(*grid)(cell.CellX(), cell.CellY()).RemoveGridObject(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).RemoveGridObject(obj);
}
}
@ -308,12 +308,12 @@ void Map::RemoveFromGrid(Creature* obj, NGridType *grid, Cell const& cell)
// remove from world object registry in grid
if(obj->isPet() || obj->isVehicle())
{
(*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject<Creature>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject<Creature>(obj);
}
// remove from grid object store
else
{
(*grid)(cell.CellX(), cell.CellY()).RemoveGridObject<Creature>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).RemoveGridObject<Creature>(obj);
}
}