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/date_type.h
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/saveload/saveload.h
#	src/table/settings/linkgraph_settings.ini
This commit is contained in:
Jonathan G Rennison
2023-05-22 19:50:45 +01:00
parent 9a4512f789 730687080a
commit 37b8b59c85
9 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/table/settings/settings.ini
View File

@@ -1078,25 +1078,25 @@ patxname = ""max_town_heightlevel.economy.min_city_land_area""
var = linkgraph.recalc_interval
type = SLE_UINT16
from = SLV_183
def = 4
min = 2
max = 32
interval = 2
str = STR_CONFIG_SETTING_LINKGRAPH_INTERVAL
def = 8
min = 4
max = 90
interval = 1
str = STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL
strval = STR_JUST_COMMA
strhelp = STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT
strhelp = STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL_HELPTEXT
[SDT_VAR]
var = linkgraph.recalc_time
type = SLE_UINT16
from = SLV_183
def = 16
def = 32
min = 1
max = 4096
max = 9000
interval = 1
str = STR_CONFIG_SETTING_LINKGRAPH_TIME
str = STR_CONFIG_SETTING_LINKGRAPH_RECALC_TIME
strval = STR_JUST_COMMA
strhelp = STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT
strhelp = STR_CONFIG_SETTING_LINKGRAPH_RECALC_TIME_HELPTEXT
[SDT_NAMED_NULL]
name = ""linkgraph.recalc_not_scaled_by_daylength""