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

Merge branch 'infrastructure_sharing-sx' into jgrpp

Browse Source 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-06 23:11:49 +01:00
parent 44ed3cb3bd b3ebb1f729
commit 4c6dc11c16
34 changed files with 808 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/table/settings.ini
View File

@@ -48,6 +48,10 @@ static bool UpdateClientName(int32 p1);
static bool UpdateServerPassword(int32 p1);
static bool UpdateRconPassword(int32 p1);
static bool UpdateClientConfigValues(int32 p1);
static bool CheckSharingRail(int32 p1);
static bool CheckSharingRoad(int32 p1);
static bool CheckSharingWater(int32 p1);
static bool CheckSharingAir(int32 p1);
#endif /* ENABLE_NETWORK */
/* End - Callback Functions for the various settings */
@@ -1531,6 +1535,98 @@ cat = SC_EXPERT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_PROG_SIGS)
patxname = ""programmable_signals.construction.maximum_signal_evaluations""
[SDT_BOOL]
base = GameSettings
var = economy.infrastructure_sharing[0]
def = false
str = STR_CONFIG_SETTING_SHARING_RAIL
proc = CheckSharingRail
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.infrastructure_sharing.rail""
[SDT_BOOL]
base = GameSettings
var = economy.infrastructure_sharing[1]
def = false
str = STR_CONFIG_SETTING_SHARING_ROAD
proc = CheckSharingRoad
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.infrastructure_sharing.road""
[SDT_BOOL]
base = GameSettings
var = economy.infrastructure_sharing[2]
def = false
str = STR_CONFIG_SETTING_SHARING_WATER
proc = CheckSharingWater
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.infrastructure_sharing.water""
[SDT_BOOL]
base = GameSettings
var = economy.infrastructure_sharing[3]
def = false
str = STR_CONFIG_SETTING_SHARING_AIR
proc = CheckSharingAir
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.infrastructure_sharing.air""
[SDT_VAR]
base = GameSettings
var = economy.sharing_fee[0]
type = SLE_UINT
def = 100
min = 0
max = 1000000
interval = 10
str = STR_CONFIG_SETTING_SHARING_FEE_RAIL
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.sharing_fee.rail""
[SDT_VAR]
base = GameSettings
var = economy.sharing_fee[1]
type = SLE_UINT
def = 100
min = 0
max = 1000000
interval = 10
str = STR_CONFIG_SETTING_SHARING_FEE_ROAD
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.sharing_fee.road""
[SDT_VAR]
base = GameSettings
var = economy.sharing_fee[2]
type = SLE_UINT
def = 100
min = 0
max = 1000000
interval = 10
str = STR_CONFIG_SETTING_SHARING_FEE_WATER
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.sharing_fee.water""
[SDT_VAR]
base = GameSettings
var = economy.sharing_fee[3]
type = SLE_UINT
def = 100
min = 0
max = 1000000
interval = 10
str = STR_CONFIG_SETTING_SHARING_FEE_AIR
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.sharing_fee.air""
[SDT_BOOL]
base = GameSettings
var = economy.sharing_payment_in_debt
def = false
str = STR_CONFIG_SETTING_SHARING_PAYMENT_IN_DEBT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.sharing_payment_in_debt""
; previously ai-new setting.
[SDT_NULL]
length = 1