Merge branch 'improved_breakdowns-sx' into jgrpp

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
6 changed files with 22 additions and 18 deletions

View File

@@ -509,7 +509,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
bool improved_breakdowns; ///< different types, chances and severities of breakdowns
bool pay_for_repair; ///< pay for repairing vehicle
uint8 repair_cost; ///< cost of repairing vehicle
};