Merge branch 'vehicle_repair_costs-sx' into jgrpp

Conflicts:
	src/lang/english.txt
	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-04 23:59:12 +01:00
11 changed files with 96 additions and 0 deletions

View File

@@ -1611,6 +1611,8 @@ static SettingsContainer &GetSettingsTree()
company->Add(new SettingEntry("company.engine_renew"));
company->Add(new SettingEntry("company.engine_renew_months"));
company->Add(new SettingEntry("company.engine_renew_money"));
company->Add(new SettingEntry("vehicle.pay_for_repair"));
company->Add(new SettingEntry("vehicle.repair_cost"));
company->Add(new SettingEntry("vehicle.servint_ispercent"));
company->Add(new SettingEntry("vehicle.servint_trains"));
company->Add(new SettingEntry("vehicle.servint_roadveh"));