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

Merge branch 'improved_breakdowns' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2017-06-06 21:08:37 +01:00
parent 21696cc126 350c2bb24f
commit bbd2e6f2f5
7 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/train.h
View File

@@ -30,7 +30,7 @@ enum VehicleRailFlags {
VRF_HAVE_SLOT = 2, ///< Train has 1 or more slots
VRF_POWEREDWAGON = 3, ///< Wagon is powered.
VRF_REVERSE_DIRECTION = 4, ///< Reverse the visible direction of the vehicle.
VRF_HAS_HIT_RV = 5, ///< Train has hit road vehicle
VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL = 6, ///< Electric train engine is allowed to run on normal rail. */
VRF_TOGGLE_REVERSE = 7, ///< Used for vehicle var 0xFE bit 8 (toggled each time the train is reversed, accurate for first vehicle only).
VRF_TRAIN_STUCK = 8, ///< Train can't get a path reservation.