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

Import infrastructure sharing patch

Browse Source 
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
This commit is contained in:
patch-import
2015-08-06 22:24:24 +01:00
committed by Jonathan G Rennison
parent 856896c36e
commit ee791055f9
32 changed files with 794 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/table/settings.ini
View File

@@ -47,6 +47,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 */
@@ -1123,6 +1127,89 @@ from = 77
def = true
str = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD
[SDT_BOOL]
base = GameSettings
var = economy.infrastructure_sharing[0]
from = 200
def = false
str = STR_CONFIG_SETTING_SHARING_RAIL
proc = CheckSharingRail
[SDT_BOOL]
base = GameSettings
var = economy.infrastructure_sharing[1]
from = 200
def = false
str = STR_CONFIG_SETTING_SHARING_ROAD
proc = CheckSharingRoad
[SDT_BOOL]
base = GameSettings
var = economy.infrastructure_sharing[2]
from = 200
def = false
str = STR_CONFIG_SETTING_SHARING_WATER
proc = CheckSharingWater
[SDT_BOOL]
base = GameSettings
var = economy.infrastructure_sharing[3]
from = 200
def = false
str = STR_CONFIG_SETTING_SHARING_AIR
proc = CheckSharingAir
[SDT_VAR]
base = GameSettings
var = economy.sharing_fee[0]
type = SLE_UINT
from = 200
def = 100
min = 0
max = 1000000
interval = 10
str = STR_CONFIG_SETTING_SHARING_FEE_RAIL
[SDT_VAR]
base = GameSettings
var = economy.sharing_fee[1]
type = SLE_UINT
from = 200
def = 100
min = 0
max = 1000000
interval = 10
str = STR_CONFIG_SETTING_SHARING_FEE_ROAD
[SDT_VAR]
base = GameSettings
var = economy.sharing_fee[2]
type = SLE_UINT
from = 200
def = 100
min = 0
max = 1000000
interval = 10
str = STR_CONFIG_SETTING_SHARING_FEE_ROAD
[SDT_VAR]
base = GameSettings
var = economy.sharing_fee[3]
type = SLE_UINT
from = 200
def = 100
min = 0
max = 1000000
interval = 10
str = STR_CONFIG_SETTING_SHARING_FEE_AIR
[SDT_BOOL]
base = GameSettings
var = economy.sharing_payment_in_debt
from = 200
def = false
str = STR_CONFIG_SETTING_SHARING_PAYMENT_IN_DEBT
; previously ai-new setting.
[SDT_NULL]
length = 1