From aedd38255b2bc961d95a53cf784c3110711e05e3 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 16 Apr 2011 16:41:02 +0000 Subject: [PATCH] (svn r22327) -Add: Vehicle::GetGroundVehicleFlags() for accessing GroundVehicle<>::gv_flags through a Vehicle struct. --- src/vehicle.cpp | 30 ++++++++++++++++++++++++++++++ src/vehicle_base.h | 3 +++ 2 files changed, 33 insertions(+) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index f4f38bd9cd..38437c1b92 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2391,6 +2391,36 @@ const GroundVehicleCache *Vehicle::GetGroundVehicleCache() const } } +/** + * Access the ground vehicle flags of the vehicle. + * @pre The vehicle is a #GroundVehicle. + * @return #GroundVehicleFlags of the vehicle. + */ +uint16 &Vehicle::GetGroundVehicleFlags() +{ + assert(this->IsGroundVehicle()); + if (this->type == VEH_TRAIN) { + return Train::From(this)->gv_flags; + } else { + return RoadVehicle::From(this)->gv_flags; + } +} + +/** + * Access the ground vehicle flags of the vehicle. + * @pre The vehicle is a #GroundVehicle. + * @return #GroundVehicleFlags of the vehicle. + */ +const uint16 &Vehicle::GetGroundVehicleFlags() const +{ + assert(this->IsGroundVehicle()); + if (this->type == VEH_TRAIN) { + return Train::From(this)->gv_flags; + } else { + return RoadVehicle::From(this)->gv_flags; + } +} + /** * Calculates the set of vehicles that will be affected by a given selection. * @param set [inout] Set of affected vehicles. diff --git a/src/vehicle_base.h b/src/vehicle_base.h index baf99d3987..a673bcfd1e 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -249,6 +249,9 @@ public: GroundVehicleCache *GetGroundVehicleCache(); const GroundVehicleCache *GetGroundVehicleCache() const; + uint16 &GetGroundVehicleFlags(); + const uint16 &GetGroundVehicleFlags() const; + void DeleteUnreachedAutoOrders(); void HandleLoading(bool mode = false);