diff options
| author | rubidium <rubidium@openttd.org> | 2007-12-19 23:26:02 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-12-19 23:26:02 +0000 |
| commit | 5b49e754535d48bb42575bc987e9c8f3251cf595 (patch) | |
| tree | 6c554e9bcc282dbe3b7ab306ad3c91c7a4ff545b /src/vehicle.h | |
| parent | d582aea639e5d3ee592ec37f90b03bebbc3163f1 (diff) | |
| download | openttd-5b49e754535d48bb42575bc987e9c8f3251cf595.tar.xz | |
(svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h
Diffstat (limited to 'src/vehicle.h')
| -rw-r--r-- | src/vehicle.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/vehicle.h b/src/vehicle.h index 48c507f15..7ab327fee 100644 --- a/src/vehicle.h +++ b/src/vehicle.h @@ -5,6 +5,7 @@ #ifndef VEHICLE_H #define VEHICLE_H +#include "vehicle_type.h" #include "oldpool.h" #include "order.h" #include "track_type.h" @@ -69,20 +70,6 @@ enum RoadVehicleStates { RVSB_ROAD_STOP_TRACKDIR_MASK = 0x09 ///< Only bits 0 and 3 are used to encode the trackdir for road stops }; -enum VehicleType { - VEH_TRAIN, - VEH_ROAD, - VEH_SHIP, - VEH_AIRCRAFT, - VEH_SPECIAL, - VEH_DISASTER, - VEH_END, - VEH_INVALID = 0xFF, -}; -DECLARE_POSTFIX_INCREMENT(VehicleType); -template <> struct EnumPropsT<VehicleType> : MakeEnumPropsT<VehicleType, byte, VEH_TRAIN, VEH_END, VEH_INVALID> {}; -typedef TinyEnumT<VehicleType> VehicleTypeByte; - enum VehStatus { VS_HIDDEN = 0x01, VS_STOPPED = 0x02, @@ -218,7 +205,6 @@ struct VehicleShip { TrackBitsByte state; }; -struct Vehicle; DECLARE_OLD_POOL(Vehicle, Vehicle, 9, 125) /* Some declarations of functions, so we can make them friendly */ |