From 0a57db01aff22e9afa368b370d48659854ca4bdd Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Sun, 21 Apr 2019 22:30:13 +0100 Subject: [PATCH] Codechange: Remove TrainForceProceedingByte type --- src/train.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/train.h b/src/train.h index 3bbb6cafbe..b50a9d87b5 100644 --- a/src/train.h +++ b/src/train.h @@ -36,12 +36,11 @@ enum VehicleRailFlags { }; /** Modes for ignoring signals. */ -enum TrainForceProceeding { +enum TrainForceProceeding : byte { TFP_NONE = 0, ///< Normal operation. TFP_STUCK = 1, ///< Proceed till next signal, but ignore being stuck till then. This includes force leaving depots. TFP_SIGNAL = 2, ///< Ignore next signal, after the signal ignore being stuck. }; -typedef SimpleTinyEnumT TrainForceProceedingByte; /** Flags for Train::ConsistChanged */ enum ConsistChangeFlags { @@ -95,7 +94,7 @@ struct Train FINAL : public GroundVehicle { uint16 flags; TrackBitsByte track; - TrainForceProceedingByte force_proceed; + TrainForceProceeding force_proceed; RailTypeByte railtype; RailTypes compatible_railtypes;