Core/Vehicles: Fix warnings

This commit is contained in:
Vincent-Michael
2012-09-10 15:44:12 +02:00
parent 358c6a26d6
commit 06eff1644d
5 changed files with 7 additions and 7 deletions
@@ -2480,7 +2480,7 @@ void Creature::SetPosition(float x, float y, float z, float o)
GetMap()->CreatureRelocation(ToCreature(), x, y, z, o); GetMap()->CreatureRelocation(ToCreature(), x, y, z, o);
if (IsVehicle()) if (IsVehicle())
GetVehicleKit()->RelocatePassengers(x, y, z, o); GetVehicleKit()->RelocatePassengers();
} }
bool Creature::IsDungeonBoss() const bool Creature::IsDungeonBoss() const
+2 -2
View File
@@ -17325,7 +17325,7 @@ void Unit::UpdateOrientation(float orientation)
{ {
SetOrientation(orientation); SetOrientation(orientation);
if (IsVehicle()) if (IsVehicle())
GetVehicleKit()->RelocatePassengers(GetPositionX(), GetPositionY(), GetPositionZ(), orientation); GetVehicleKit()->RelocatePassengers();
} }
//! Only server-side height update, does not broadcast to client //! Only server-side height update, does not broadcast to client
@@ -17333,7 +17333,7 @@ void Unit::UpdateHeight(float newZ)
{ {
Relocate(GetPositionX(), GetPositionY(), newZ); Relocate(GetPositionX(), GetPositionY(), newZ);
if (IsVehicle()) if (IsVehicle())
GetVehicleKit()->RelocatePassengers(GetPositionX(), GetPositionY(), newZ, GetOrientation()); GetVehicleKit()->RelocatePassengers();
} }
void Unit::SendThreatListUpdate() void Unit::SendThreatListUpdate()
+1 -1
View File
@@ -437,7 +437,7 @@ void Vehicle::RemovePassenger(Unit* unit)
} }
//! Must be called after m_base::Relocate //! Must be called after m_base::Relocate
void Vehicle::RelocatePassengers(float x, float y, float z, float ang) void Vehicle::RelocatePassengers()
{ {
ASSERT(_me->GetMap()); ASSERT(_me->GetMap());
+1 -1
View File
@@ -52,7 +52,7 @@ class Vehicle : public TransportBase
bool AddPassenger(Unit* passenger, int8 seatId = -1); bool AddPassenger(Unit* passenger, int8 seatId = -1);
void EjectPassenger(Unit* passenger, Unit* controller); void EjectPassenger(Unit* passenger, Unit* controller);
void RemovePassenger(Unit* passenger); void RemovePassenger(Unit* passenger);
void RelocatePassengers(float x, float y, float z, float ang); void RelocatePassengers();
void RemoveAllPassengers(); void RemoveAllPassengers();
void Dismiss(); void Dismiss();
void TeleportVehicle(float x, float y, float z, float ang); void TeleportVehicle(float x, float y, float z, float ang);
+2 -2
View File
@@ -711,7 +711,7 @@ void Map::PlayerRelocation(Player* player, float x, float y, float z, float orie
player->Relocate(x, y, z, orientation); player->Relocate(x, y, z, orientation);
if (player->IsVehicle()) if (player->IsVehicle())
player->GetVehicleKit()->RelocatePassengers(x, y, z, orientation); player->GetVehicleKit()->RelocatePassengers();
if (old_cell.DiffGrid(new_cell) || old_cell.DiffCell(new_cell)) if (old_cell.DiffGrid(new_cell) || old_cell.DiffCell(new_cell))
{ {
@@ -757,7 +757,7 @@ void Map::CreatureRelocation(Creature* creature, float x, float y, float z, floa
{ {
creature->Relocate(x, y, z, ang); creature->Relocate(x, y, z, ang);
if (creature->IsVehicle()) if (creature->IsVehicle())
creature->GetVehicleKit()->RelocatePassengers(x, y, z, ang); creature->GetVehicleKit()->RelocatePassengers();
creature->UpdateObjectVisibility(false); creature->UpdateObjectVisibility(false);
RemoveCreatureFromMoveList(creature); RemoveCreatureFromMoveList(creature);
} }