Changeset - r23662:7a4b2a0aee2a
[Not reviewed]
master
0 1 0
Charles Pigott - 5 years ago 2019-04-21 21:30:13
charlespigott@googlemail.com
Codechange: Remove TrainForceProceedingByte type
1 file changed with 2 insertions and 3 deletions:
0 comments (0 inline, 0 general)
src/train.h
Show inline comments
 
@@ -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 GroundVehicl
 

	
 
	uint16 flags;
 
	TrackBitsByte track;
 
	TrainForceProceedingByte force_proceed;
 
	TrainForceProceeding force_proceed;
 
	RailTypeByte railtype;
 
	RailTypes compatible_railtypes;
 

	
0 comments (0 inline, 0 general)