Merge remote-tracking branch 'origin/master' into mmaps

2012-09-11 01:13:41 +01:00
parent f237a57f51 8d049545de
commit b1c4118a33
116 changed files with 623 additions and 453 deletions
@@ -437,7 +437,7 @@ void Vehicle::RemovePassenger(Unit* unit)
 }

 //! Must be called after m_base::Relocate
-void Vehicle::RelocatePassengers(float x, float y, float z, float ang)
+void Vehicle::RelocatePassengers()
 {
    ASSERT(_me->GetMap());