aboutsummaryrefslogtreecommitdiff
path: root/src/game/Map.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-28 22:44:09 -0600
committermegamage <none@none>2009-03-28 22:44:09 -0600
commit783e4fd3ff077b3023046f407a99552c109ef486 (patch)
treef7f3c5c33ed75603e077e43ae9c3e9f56b5be4c0 /src/game/Map.cpp
parent3a485c658d9003aaaa4bd8e99dfebb9e7f0ec862 (diff)
*Add new creature_template column VehicleId
*Allow spawn vehicles *Make vehicles grid objects. --HG-- branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
-rw-r--r--src/game/Map.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 1b2236b989e..c00b774c68f 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -237,7 +237,7 @@ template<>
void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell)
{
// add to world object registry in grid
- if(obj->isPet() || obj->isVehicle() || obj->IsTempWorldObject)
+ if(obj->isWorldCreature() || obj->IsTempWorldObject)
{
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject<Creature>(obj, obj->GetGUID());
}
@@ -289,7 +289,7 @@ template<>
void Map::RemoveFromGrid(Creature* obj, NGridType *grid, Cell const& cell)
{
// remove from world object registry in grid
- if(obj->isPet() || obj->isVehicle() || obj->IsTempWorldObject)
+ if(obj->isWorldCreature() || obj->IsTempWorldObject)
{
(*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject<Creature>(obj, obj->GetGUID());
}
@@ -2022,7 +2022,7 @@ void Map::RemoveAllObjectsInRemoveList()
switch(obj->GetTypeId())
{
case TYPEID_UNIT:
- if(!((Creature*)obj)->isPet() && !((Creature*)obj)->isVehicle())
+ if(!((Creature*)obj)->isWorldCreature())
SwitchGridContainers((Creature*)obj, on);
break;
}