diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2019-04-21 22:30:13 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-04-29 17:40:22 +0100 |
| commit | 0a57db01aff22e9afa368b370d48659854ca4bdd (patch) | |
| tree | 8b4815f6abbdb93d8e437c83da635fd4995cc47d /src/train.h | |
| parent | 69a6c494bfb81e332e63376f4577a104a5a8e679 (diff) | |
| download | openttd-0a57db01aff22e9afa368b370d48659854ca4bdd.tar.xz | |
Codechange: Remove TrainForceProceedingByte type
Diffstat (limited to 'src/train.h')
| -rw-r--r-- | src/train.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/train.h b/src/train.h index 3bbb6cafb..b50a9d87b 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<TrainForceProceeding, byte> TrainForceProceedingByte; /** Flags for Train::ConsistChanged */ enum ConsistChangeFlags { @@ -95,7 +94,7 @@ struct Train FINAL : public GroundVehicle<Train, VEH_TRAIN> { uint16 flags; TrackBitsByte track; - TrainForceProceedingByte force_proceed; + TrainForceProceeding force_proceed; RailTypeByte railtype; RailTypes compatible_railtypes; |