Merge branch 'order_occupancy-sx' into jgrpp

Conflicts: src/lang/english.txt src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/settings_gui.cpp
2015-08-09 23:45:21 +01:00
parent bd10b0fb0b fdce64ddae
commit f0fecda985
12 changed files with 129 additions and 1 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2336,6 +2336,21 @@ min      = 0
 max      = 1000000
 cat      = SC_EXPERT

+[SDT_VAR]
+base     = GameSettings
+var      = order.occupancy_smoothness
+type     = SLE_UINT8
+def      = 75
+min      = 0
+max      = 100
+interval = 10
+str      = STR_CONFIG_OCCUPANCY_SMOOTHNESS
+strhelp  = STR_CONFIG_OCCUPANCY_SMOOTHNESS_HELPTEXT
+strval   = STR_CONFIG_SETTING_PERCENTAGE
+cat      = SC_EXPERT
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_ORDER_OCCUPANCY)
+patxname = ""order_occupancy.order.occupancy_smoothness""
+
 ##
 [SDT_VAR]
 base     = GameSettings