Merge pull request #281 from VacuumBreather/train_speed_adaptation

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
This commit is contained in:
Jonathan G Rennison
2021-07-03 23:00:25 +01:00
22 changed files with 272 additions and 12 deletions

View File

@@ -573,6 +573,7 @@ struct VehicleSettings {
uint8 train_slope_steepness; ///< Steepness of hills for trains when using realistic acceleration
uint8 roadveh_slope_steepness; ///< Steepness of hills for road vehicles when using realistic acceleration
bool wagon_speed_limits; ///< enable wagon speed limits
bool train_speed_adaptation; ///< Faster trains slow down when behind slower trains
bool slow_road_vehicles_in_curves; ///< Road vehicles slow down in curves.
bool disable_elrails; ///< when true, the elrails are disabled
UnitID max_trains; ///< max trains in game per company