Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx

Conflicts:
	src/table/settings.ini

src/table/settings.ini

@@ -1505,11 +1505,13 @@ patxname = ""infra_sharing.economy.infrastructure_sharing.air""
 base     = GameSettings
 var      = economy.sharing_fee[0]
 type     = SLE_UINT
+guiflags = SGF_CURRENCY
 def      = 100
 min      = 0
 max      = 1000000
 interval = 10
 str      = STR_CONFIG_SETTING_SHARING_FEE_RAIL
+strval   = STR_JUST_CURRENCY_LONG
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
 patxname = ""infra_sharing.economy.sharing_fee.rail""
 
@@ -1517,11 +1519,13 @@ patxname = ""infra_sharing.economy.sharing_fee.rail""
 base     = GameSettings
 var      = economy.sharing_fee[1]
 type     = SLE_UINT
+guiflags = SGF_CURRENCY
 def      = 100
 min      = 0
 max      = 1000000
 interval = 10
 str      = STR_CONFIG_SETTING_SHARING_FEE_ROAD
+strval   = STR_JUST_CURRENCY_LONG
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
 patxname = ""infra_sharing.economy.sharing_fee.road""
 
@@ -1529,11 +1533,13 @@ patxname = ""infra_sharing.economy.sharing_fee.road""
 base     = GameSettings
 var      = economy.sharing_fee[2]
 type     = SLE_UINT
+guiflags = SGF_CURRENCY
 def      = 100
 min      = 0
 max      = 1000000
 interval = 10
 str      = STR_CONFIG_SETTING_SHARING_FEE_WATER
+strval   = STR_JUST_CURRENCY_LONG
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
 patxname = ""infra_sharing.economy.sharing_fee.water""
 
@@ -1541,11 +1547,13 @@ patxname = ""infra_sharing.economy.sharing_fee.water""
 base     = GameSettings
 var      = economy.sharing_fee[3]
 type     = SLE_UINT
+guiflags = SGF_CURRENCY
 def      = 100
 min      = 0
 max      = 1000000
 interval = 10
 str      = STR_CONFIG_SETTING_SHARING_FEE_AIR
+strval   = STR_JUST_CURRENCY_LONG
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
 patxname = ""infra_sharing.economy.sharing_fee.air""