dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Remove TrainForceProceedingByte type

Browse Source
This commit is contained in:
Charles Pigott
2019-04-21 22:30:13 +01:00
committed by PeterN
parent 69a6c494bf
commit 0a57db01af
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/train.h
View File

@@ -36,12 +36,11 @@ enum VehicleRailFlags {
}; };
/** Modes for ignoring signals. */ /** Modes for ignoring signals. */
enum TrainForceProceeding { enum TrainForceProceeding : byte {
TFP_NONE = 0, ///< Normal operation. TFP_NONE = 0, ///< Normal operation.
TFP_STUCK = 1, ///< Proceed till next signal, but ignore being stuck till then. This includes force leaving depots. 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. TFP_SIGNAL = 2, ///< Ignore next signal, after the signal ignore being stuck.
}; };
typedef SimpleTinyEnumT<TrainForceProceeding, byte> TrainForceProceedingByte;
/** Flags for Train::ConsistChanged */ /** Flags for Train::ConsistChanged */
enum ConsistChangeFlags { enum ConsistChangeFlags {
@@ -95,7 +94,7 @@ struct Train FINAL : public GroundVehicle<Train, VEH_TRAIN> {
uint16 flags; uint16 flags;
TrackBitsByte track; TrackBitsByte track;
TrainForceProceedingByte force_proceed; TrainForceProceeding force_proceed;
RailTypeByte railtype; RailTypeByte railtype;
RailTypes compatible_railtypes; RailTypes compatible_railtypes;