diff options
author | rubidium <rubidium@openttd.org> | 2009-05-22 20:22:20 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-05-22 20:22:20 +0000 |
commit | 7a37220881c995f317bf5bd0f3077fa6c9e9d098 (patch) | |
tree | 347d24d175af30acacfedfb4ddf5c9e98d876036 /src/vehicle_base.h | |
parent | d37b840cf30ea987ab676f1a3631e112cac06244 (diff) | |
download | openttd-7a37220881c995f317bf5bd0f3077fa6c9e9d098.tar.xz |
(svn r16390) -Codechange: move u.road to RoadVehicle.
Diffstat (limited to 'src/vehicle_base.h')
-rw-r--r-- | src/vehicle_base.h | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/src/vehicle_base.h b/src/vehicle_base.h index 4719dd7af..7217f3f30 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -8,7 +8,6 @@ #include "vehicle_type.h" #include "track_type.h" #include "rail_type.h" -#include "road_type.h" #include "cargo_type.h" #include "direction_type.h" #include "gfx_type.h" @@ -25,41 +24,6 @@ #include "order_func.h" #include "transport_type.h" -/** Road vehicle states */ -enum RoadVehicleStates { - /* - * Lower 4 bits are used for vehicle track direction. (Trackdirs) - * When in a road stop (bit 5 or bit 6 set) these bits give the - * track direction of the entry to the road stop. - * As the entry direction will always be a diagonal - * direction (X_NE, Y_SE, X_SW or Y_NW) only bits 0 and 3 - * are needed to hold this direction. Bit 1 is then used to show - * that the vehicle is using the second road stop bay. - * Bit 2 is then used for drive-through stops to show the vehicle - * is stopping at this road stop. - */ - - /* Numeric values */ - RVSB_IN_DEPOT = 0xFE, ///< The vehicle is in a depot - RVSB_WORMHOLE = 0xFF, ///< The vehicle is in a tunnel and/or bridge - - /* Bit numbers */ - RVS_USING_SECOND_BAY = 1, ///< Only used while in a road stop - RVS_IS_STOPPING = 2, ///< Only used for drive-through stops. Vehicle will stop here - RVS_DRIVE_SIDE = 4, ///< Only used when retrieving move data - RVS_IN_ROAD_STOP = 5, ///< The vehicle is in a road stop - RVS_IN_DT_ROAD_STOP = 6, ///< The vehicle is in a drive-through road stop - - /* Bit sets of the above specified bits */ - RVSB_IN_ROAD_STOP = 1 << RVS_IN_ROAD_STOP, ///< The vehicle is in a road stop - RVSB_IN_ROAD_STOP_END = RVSB_IN_ROAD_STOP + TRACKDIR_END, - RVSB_IN_DT_ROAD_STOP = 1 << RVS_IN_DT_ROAD_STOP, ///< The vehicle is in a drive-through road stop - RVSB_IN_DT_ROAD_STOP_END = RVSB_IN_DT_ROAD_STOP + TRACKDIR_END, - - RVSB_TRACKDIR_MASK = 0x0F, ///< The mask used to extract track dirs - RVSB_ROAD_STOP_TRACKDIR_MASK = 0x09 ///< Only bits 0 and 3 are used to encode the trackdir for road stops -}; - enum VehStatus { VS_HIDDEN = 0x01, VS_STOPPED = 0x02, @@ -149,23 +113,6 @@ enum VehicleRailFlags { VRF_TRAIN_STUCK = 8, }; -struct VehicleRoad { - byte state; ///< @see RoadVehicleStates - byte frame; - uint16 blocked_ctr; - byte overtaking; - byte overtaking_ctr; - uint16 crashed_ctr; - byte reverse_ctr; - struct RoadStop *slot; - byte slot_age; - EngineID first_engine; - byte cached_veh_length; - - RoadType roadtype; - RoadTypes compatible_roadtypes; -}; - typedef Pool<Vehicle, VehicleID, 512, 64000> VehiclePool; extern VehiclePool _vehicle_pool; @@ -295,7 +242,6 @@ public: union { VehicleRail rail; - VehicleRoad road; } u; /* cached oftenly queried NewGRF values */ |