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

Merge branch 'improved_breakdowns-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/vehicle_sl.cpp
	src/settings_type.h
This commit is contained in:
Jonathan G Rennison
2016-01-18 23:09:17 +00:00
parent 7169b1ff4c 1678415aff
commit b43962f0bd
6 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/train.h
View File

@@ -108,6 +108,7 @@ struct Train FINAL : public GroundVehicle<Train, VEH_TRAIN> {
TrackBitsByte track;
TrainForceProceedingByte force_proceed;
RailTypeByte railtype;
byte critical_breakdown_count; ///< Counter for the number of critical breakdowns since last service
RailTypes compatible_railtypes;
/** Ticks waiting in front of a signal, ticks being stuck or a counter for forced proceeding through signals. */