Merge branch 'improved_breakdowns-sx' into jgrpp

Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/settings_type.h
2015-08-02 23:43:19 +01:00
parent b6a1866ded a8a726464c
commit a8c2c394a5
24 changed files with 790 additions and 104 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -1166,6 +1166,14 @@ strhelp  = STR_CONFIG_SETTING_PLANE_CRASHES_HELPTEXT
 strval   = STR_CONFIG_SETTING_PLANE_CRASHES_NONE
 cat      = SC_BASIC

+[SDT_BOOL]
+base     = GameSettings
+var      = vehicle.improved_breakdowns
+guiflags = SGF_NO_NETWORK
+def      = false
+str      = STR_CONFIG_SETTING_IMPROVED_BREAKDOWNS
+patxname = ""improved_breakdowns.vehicle.improved_breakdowns""
+
 ; station.join_stations
 [SDT_NULL]
 length   = 1