summaryrefslogtreecommitdiff
path: root/src/vehicle.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/vehicle.h')
-rw-r--r--src/vehicle.h16
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 */