From e931399b316c245a559962a8fcc7c2f14d4abfd4 Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 21 Jun 2010 17:35:27 +0000 Subject: (svn r20005) -Codechange: Enumify force_proceed. --- src/train.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/train.h') diff --git a/src/train.h b/src/train.h index b21900ece..557d7040c 100644 --- a/src/train.h +++ b/src/train.h @@ -43,6 +43,14 @@ enum VehicleRailFlags { VRF_TRAIN_STUCK = 8, }; +/** Modes for ignoring signals. */ +enum TrainForceProceeding { + 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 stucked. +}; +typedef SimpleTinyEnumT TrainForceProceedingByte; + byte FreightWagonMult(CargoID cargo); void CheckTrainsLengths(); @@ -94,7 +102,7 @@ struct Train : public GroundVehicle { uint16 flags; TrackBitsByte track; - byte force_proceed; + TrainForceProceedingByte force_proceed; RailTypeByte railtype; RailTypes compatible_railtypes; -- cgit v1.2.3-54-g00ecf