Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make AddToMap return bool.

Browse Source
This commit is contained in:
megamage
2011-11-28 13:23:20 -05:00
parent 49b2407077
commit cde7ea260e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/Maps/Map.cpp
View File

@@ -415,14 +415,14 @@ void Map::InitializeObject(Creature* obj)
}
template<class T>
void Map::AddToMap(T *obj)
bool Map::AddToMap(T *obj)
{
//TODO: Needs clean up. An object should not be added to map twice.
if (obj->IsInWorld())
{
ASSERT(obj->IsInGrid());
obj->UpdateObjectVisibility(true);
return;
return true;
}
CellCoord cellCoord = Trinity::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY());
@@ -433,7 +433,7 @@ void Map::AddToMap(T *obj)
if (!cellCoord.IsCoordValid())
{
sLog->outError("Map::Add: Object " UI64FMTD " has invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), cellCoord.x_coord, cellCoord.y_coord);
return;
return false; //Should delete object
}
Cell cell(cellCoord);
@@ -456,6 +456,7 @@ void Map::AddToMap(T *obj)
//something, such as vehicle, needs to be update immediately
//also, trigger needs to cast spell, if not update, cannot see visual
obj->UpdateObjectVisibility(true);
return true;
}
bool Map::IsGridLoaded(const GridCoord &p) const
@@ -664,8 +665,7 @@ void Map::RemovePlayerFromMap(Player* player, bool remove)
}
template<class T>
void
Map::RemoveFromMap(T *obj, bool remove)
void Map::RemoveFromMap(T *obj, bool remove)
{
obj->RemoveFromWorld();
if (obj->isActiveObject())
@@ -2141,10 +2141,10 @@ void Map::RemoveFromActive(Creature* c)
}
}
template void Map::AddToMap(Corpse*);
template void Map::AddToMap(Creature*);
template void Map::AddToMap(GameObject*);
template void Map::AddToMap(DynamicObject*);
template bool Map::AddToMap(Corpse*);
template bool Map::AddToMap(Creature*);
template bool Map::AddToMap(GameObject*);
template bool Map::AddToMap(DynamicObject*);
template void Map::RemoveFromMap(Corpse*, bool);
template void Map::RemoveFromMap(Creature*, bool);

2
src/server/game/Maps/Map.h
View File

@@ -246,7 +246,7 @@ class Map : public GridRefManager<NGridType>
virtual bool AddPlayerToMap(Player*);
virtual void RemovePlayerFromMap(Player*, bool);
template<class T> void AddToMap(T *);
template<class T> bool AddToMap(T *);
template<class T> void RemoveFromMap(T *, bool);
void VisitNearbyCellsOf(WorldObject* obj, TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &gridVisitor, TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &worldVisitor);