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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/console_cmds.cpp
#	src/date.cpp
#	src/economy.cpp
#	src/misc.cpp
#	src/newgrf_house.cpp
This commit is contained in:
Jonathan G Rennison
2020-01-29 19:32:06 +00:00
parent ab1b8ab209 2fee030a26
commit 81a1094cc8
52 changed files with 787 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/table/settings.ini
View File

@@ -2147,15 +2147,6 @@ strhelp = STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT
strval = STR_CONFIG_SETTING_PERCENTAGE
cat = SC_EXPERT
[SDT_BOOL]
base = GameSettings
var = economy.feeder_payment_src_station
def = false
str = STR_CONFIG_SETTING_FEEDER_PAYMENT_SRC_STATION
strhelp = STR_CONFIG_SETTING_FEEDER_PAYMENT_SRC_STATION_HELPTEXT
cat = SC_EXPERT
patxname = ""economy.feeder_payment_src_station""
[SDT_XREF]
xref = ""economy.day_length_factor""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)