Merge branch 'improved_breakdowns-sx' into jgrpp

Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 23:43:19 +01:00
24 changed files with 790 additions and 104 deletions

View File

@@ -486,6 +486,7 @@ struct VehicleSettings {
byte road_side; ///< the side of the road vehicles drive on
uint8 plane_crashes; ///< number of plane crashes, 0 = none, 1 = reduced, 2 = normal
bool adjacent_crossings; ///< enable closing of adjacent level crossings
bool improved_breakdowns; ///< different types, chances and serverities of breakdowns
};
/** Settings related to the economy. */