(svn r25508) -Change: split unit localisation choice into a choice per type of unit, and move it to the advanced settings

-Feature [FS#5482]: have tractive effort in imperial (lbf) and metric (kgf) units
-Feature: have weights and volumes in imperial units (short tons, gallons)

1 files changed, 100 insertions, 2 deletions

diff --git a/src/table/settings.ini b/src/table/settings.ini
index 70363b600..0b723a0ae 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -64,6 +64,7 @@ const SettingDesc _settings[] = {
 [templates]
 SDTG_BOOL  =  SDTG_BOOL($name,              $flags, $guiflags, $var, $def,                        $str, $strhelp, $strval, $proc, $from, $to,        $cat),
 SDTG_VAR   =   SDTG_VAR($name,       $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to,        $cat),
+SDTG_OMANY = SDTG_OMANY($name,       $type, $flags, $guiflags, $var, $def,       $max, $full,     $str, $strhelp, $strval, $proc, $from, $to,        $cat),
 SDTC_BOOL  =  SDTC_BOOL(       $var,        $flags, $guiflags, $def,                              $str, $strhelp, $strval, $proc, $from, $to,        $cat),
 SDTC_LIST  =  SDTC_LIST(       $var, $type, $flags, $guiflags, $def,                              $str, $strhelp, $strval, $proc, $from, $to,        $cat),
 SDTC_OMANY = SDTC_OMANY(       $var, $type, $flags, $guiflags, $def,             $max, $full,     $str, $strhelp, $strval, $proc, $from, $to,        $cat),
@@ -2325,17 +2326,114 @@ full     = _locale_currencies
 proc     = RedrawScreen
 cat      = SC_BASIC
 
+[SDTG_OMANY]
+name     = ""units""
+var      = _old_units
+type     = SLE_UINT8
+from     = 97
+to       = 183
+flags    = SLF_NOT_IN_CONFIG
+def      = 1
+max      = 2
+full     = _locale_units
+proc     = RedrawScreen
+cat      = SC_BASIC
+
 [SDT_OMANY]
 base     = GameSettings
-var      = locale.units
+var      = locale.units_velocity
 type     = SLE_UINT8
-from     = 97
+from     = 184
+flags    = SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _locale_units
+proc     = RedrawScreen
+cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY
+strhelp  = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT
+strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL
+
+[SDT_OMANY]
+base     = GameSettings
+var      = locale.units_power
+type     = SLE_UINT8
+from     = 184
+flags    = SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _locale_units
+proc     = RedrawScreen
+cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER
+strhelp  = STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT
+strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL
+
+[SDT_OMANY]
+base     = GameSettings
+var      = locale.units_weight
+type     = SLE_UINT8
+from     = 184
+flags    = SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _locale_units
+proc     = RedrawScreen
+cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT
+strhelp  = STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_HELPTEXT
+strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL
+
+[SDT_OMANY]
+base     = GameSettings
+var      = locale.units_volume
+type     = SLE_UINT8
+from     = 184
 flags    = SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _locale_units
+proc     = RedrawScreen
+cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME
+strhelp  = STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT
+strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL
+
+[SDT_OMANY]
+base     = GameSettings
+var      = locale.units_force
+type     = SLE_UINT8
+from     = 184
+flags    = SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _locale_units
+proc     = RedrawScreen
+cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE
+strhelp  = STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_HELPTEXT
+strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_IMPERIAL
+
+[SDT_OMANY]
+base     = GameSettings
+var      = locale.units_height
+type     = SLE_UINT8
+from     = 184
+flags    = SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
 def      = 1
 max      = 2
 full     = _locale_units
 proc     = RedrawScreen
 cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT
+strhelp  = STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT
+strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL
 
 [SDT_STR]
 base     = GameSettings