dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx

Browse Source 
Conflicts:
	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2015-08-07 22:02:38 +01:00
parent 2f8d330307 65b1586f98
commit e1defe24c7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/table/settings.ini
View File

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