diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Player.h | 1 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 7 | ||||
| -rw-r--r-- | src/game/Unit.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/game/Player.h b/src/game/Player.h index 13cda2117c2..3f328d4503f 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -2578,7 +2578,6 @@ class Player : public Unit, public GridObject<Player> MapReference m_mapRef; void UpdateCharmedAI(); - UnitAI *i_AI; uint32 m_lastFallTime; float m_lastFallZ; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index c11bff030c1..1b7813d6bbb 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -15287,9 +15287,10 @@ Unit *Unit::GetVehicleBase() const Creature *Unit::GetVehicleCreatureBase() const { - Unit *veh = GetVehicleBase(); - if (veh && veh->GetTypeId() == TYPEID_UNIT) - return dynamic_cast<Creature*>(veh); + if( Unit *veh = GetVehicleBase()) + if( Creature *c = veh->ToCreature()) + return c; + return NULL; } diff --git a/src/game/Unit.h b/src/game/Unit.h index 0bdb3e573e0..5e40703fd74 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1919,7 +1919,7 @@ class Unit : public WorldObject void RemoveVehicleKit(); Vehicle *GetVehicleKit()const { return m_vehicleKit; } Vehicle *GetVehicle() const { return m_vehicle; } - bool IsOnVehicle(const Unit *unit) const { return m_vehicle && m_vehicle == unit->GetVehicleKit(); } + bool IsOnVehicle(const Unit *vehicle) const { return m_vehicle && m_vehicle == vehicle->GetVehicleKit(); } Unit *GetVehicleBase() const; Creature *GetVehicleCreatureBase() const; float GetTransOffsetX() const { return m_movementInfo.t_x; } |