aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.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/Object.cpp
parent3a485c658d9003aaaa4bd8e99dfebb9e7f0ec862 (diff)
*Add new creature_template column VehicleId
*Allow spawn vehicles *Make vehicles grid objects. --HG-- branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
-rw-r--r--src/game/Object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 79c3ebba369..c47c3625160 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1746,7 +1746,7 @@ Vehicle* WorldObject::SummonVehicle(uint32 entry, float x, float y, float z, flo
if(!ci)
return NULL;
- uint32 id = ci->spells[7]; //temp store id here
+ uint32 id = ci->VehicleId; //temp store id here
if(!id) id = 156;
VehicleEntry const *ve = sVehicleStore.LookupEntry(id);
if(!ve)
@@ -1757,7 +1757,7 @@ Vehicle* WorldObject::SummonVehicle(uint32 entry, float x, float y, float z, flo
uint32 team = 0;
if (GetTypeId()==TYPEID_PLAYER)
team = ((Player*)this)->GetTeam();
- if(!v->Create(objmgr.GenerateLowGuid(HIGHGUID_VEHICLE), map, entry, id, team))
+ if(!v->Create(objmgr.GenerateLowGuid(HIGHGUID_VEHICLE), map, GetPhaseMask(), entry, id, team))
{
delete v;
return NULL;