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

@@ -4205,5 +4205,30 @@ strhelp = STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_HELPTEXT
strval = STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND
cat = SC_BASIC
[SDT_BOOL]
base = GameSettings
var = vehicle.pay_for_repair
def = true
str = STR_CONFIG_SETTING_PAY_FOR_REPAIR_VEHICLE
strhelp = STR_CONFIG_SETTING_PAY_FOR_REPAIR_VEHICLE_HELPTEXT
cat = SC_EXPERT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_VEHICLE_REPAIR_COST)
patxname = ""vehicle_repair_cost.vehicle.pay_for_repair""
[SDT_VAR]
base = GameSettings
var = vehicle.repair_cost
type = SLE_UINT8
def = 100
min = 1
max = 255
interval = 1
str = STR_CONFIG_SETTING_REPAIR_COST
strhelp = STR_CONFIG_SETTING_REPAIR_COST_HELPTEXT
strval = STR_JUST_INT
cat = SC_EXPERT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_VEHICLE_REPAIR_COST)
patxname = ""vehicle_repair_cost.vehicle.repair_cost""
[SDT_END]