diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-01-02 14:20:05 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-01-02 14:20:05 +0100 |
| commit | 9d6904f03d67e6feddcbd77f9d74cd4f3b9c38ad (patch) | |
| tree | 021063453917e3e49b776e77a0daf0b651d1ca00 /src/server/game/Entities/Vehicle | |
| parent | 82181a8622f9a6981f9649b8ea99dd94d2184d11 (diff) | |
Core/Vehicles
* Fixed vehicle orientation on transports
* Fixed exiting vehicles on moving transports
Diffstat (limited to 'src/server/game/Entities/Vehicle')
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index a48f46191ba..fae4f0c6b6a 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -521,8 +521,13 @@ Vehicle* Vehicle::RemovePassenger(Unit* unit) if (_me->IsInWorld()) { - unit->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT); - unit->m_movementInfo.transport.Reset(); + if (!_me->GetTransport()) + { + unit->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT); + unit->m_movementInfo.transport.Reset(); + } + else + unit->m_movementInfo.transport = _me->m_movementInfo.transport; } // only for flyable vehicles |