diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-08-04 11:33:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 11:33:29 +0200 |
| commit | 15e85f882fdb7b5d1d48302907e76c993ee4e923 (patch) | |
| tree | 4c37b3a480d45d4ee2a06870d459b82ee3977ab8 /src/server/game/Entities/Unit | |
| parent | b159921099e3d10fbe282d9496b9ffb56f28f16d (diff) | |
Core/Vehicle: Change vehicle accessories' phase according to the player on the vehicle (#23646)
* Core/Vehicle: Change vehicle accessories' phase according to the player on the vehicle
* Get the root vehicle to set the phase to all accessories.
Attempt to get the accessories to stay mounted on the vehicle.
* Fix the accessories to stay mounted on the vehicle
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 16 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 7 |
2 files changed, 20 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 07c3b35de1a..7fae69d54f0 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11657,6 +11657,22 @@ Unit* Unit::GetVehicleBase() const return m_vehicle ? m_vehicle->GetBase() : nullptr; } +Unit* Unit::GetVehicleRoot() const +{ + Unit* vehicleRoot = GetVehicleBase(); + + if (!vehicleRoot) + return nullptr; + + for (;;) + { + if (!vehicleRoot->GetVehicleBase()) + return vehicleRoot; + + vehicleRoot = vehicleRoot->GetVehicleBase(); + } +} + Creature* Unit::GetVehicleCreatureBase() const { if (Unit* veh = GetVehicleBase()) diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index f92c80c9b55..1de18af19b7 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1593,11 +1593,12 @@ class TC_GAME_API Unit : public WorldObject ObjectGuid LastCharmerGUID; bool CreateVehicleKit(uint32 id, uint32 creatureEntry); void RemoveVehicleKit(); - Vehicle* GetVehicleKit()const { return m_vehicleKit; } - Vehicle* GetVehicle() const { return m_vehicle; } + Vehicle* GetVehicleKit() const { return m_vehicleKit; } + Vehicle* GetVehicle() const { return m_vehicle; } void SetVehicle(Vehicle* vehicle) { m_vehicle = vehicle; } bool IsOnVehicle(Unit const* vehicle) const; - Unit* GetVehicleBase() const; + Unit* GetVehicleBase() const; + Unit* GetVehicleRoot() const; Creature* GetVehicleCreatureBase() const; ObjectGuid GetTransGUID() const override; /// Returns the transport this unit is on directly (if on vehicle and transport, return vehicle) |
