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

Merge branch 'day_length-sx' into jgrpp

Browse Source 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/timetable_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-09 13:51:36 +01:00
parent e0bc6e0cf6 41062cf78e
commit 9565e5b9b1
13 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/table/settings.ini
View File

@@ -1324,6 +1324,20 @@ str = STR_CONFIG_SETTING_INFLATION
strhelp = STR_CONFIG_SETTING_INFLATION_HELPTEXT
cat = SC_BASIC
[SDT_VAR]
base = GameSettings
var = economy.day_length_factor
type = SLE_UINT8
def = 1
min = 1
max = 125
str = STR_CONFIG_SETTING_DAY_LENGTH_FACTOR
strhelp = STR_CONFIG_SETTING_DAY_LENGTH_FACTOR_HELPTEXT
strval = STR_JUST_COMMA
cat = SC_BASIC
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_VARIABLE_DAY_LENGTH)
patxname = ""variable_day_length.economy.day_length_factor""
[SDT_VAR]
base = GameSettings
var = construction.raw_industry_construction