Merge branch 'auto_timetables-sx' into jgrpp

Conflicts: src/saveload/extended_ver_sl.cpp
2015-09-03 23:30:13 +01:00
parent c6854afcef 42370dc28d
commit e9dc82c801
10 changed files with 23 additions and 1 deletions
--- a/src/table/company_settings.ini
+++ b/src/table/company_settings.ini
@@ -140,6 +140,14 @@ strhelp  = STR_CONFIG_SETTING_SERVINT_AIRCRAFT_HELPTEXT
 strval   = STR_CONFIG_SETTING_SERVINT_VALUE
 proc     = UpdateIntervalAircraft

+[SDT_BOOL]
+base     = CompanySettings
+var      = vehicle.auto_timetable_by_default
+guiflags = SGF_PER_COMPANY
+def      = false
+str      = STR_CONFIG_SETTING_AUTO_TIMETABLE_BY_DEFAULT
+strhelp  = STR_CONFIG_SETTING_AUTO_TIMETABLE_BY_DEFAULT_HELPTEXT
+
 [SDT_END]