summaryrefslogtreecommitdiff
path: root/src/train.h
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2010-06-21 17:35:27 +0000
committerfrosch <frosch@openttd.org>2010-06-21 17:35:27 +0000
commite931399b316c245a559962a8fcc7c2f14d4abfd4 (patch)
tree4957227f5b4780b5de5d5cd3c75d7e04d34d6ab8 /src/train.h
parent3c6fb88a095aa5404807ce26bb3a1529b25f5ffb (diff)
downloadopenttd-e931399b316c245a559962a8fcc7c2f14d4abfd4.tar.xz
(svn r20005) -Codechange: Enumify force_proceed.
Diffstat (limited to 'src/train.h')
-rw-r--r--src/train.h10
1 files changed, 9 insertions, 1 deletions
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<TrainForceProceeding, byte> TrainForceProceedingByte;
+
byte FreightWagonMult(CargoID cargo);
void CheckTrainsLengths();
@@ -94,7 +102,7 @@ struct Train : public GroundVehicle<Train, VEH_TRAIN> {
uint16 flags;
TrackBitsByte track;
- byte force_proceed;
+ TrainForceProceedingByte force_proceed;
RailTypeByte railtype;
RailTypes compatible_railtypes;