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

Merge branch 'ingame_rivers' into jgrpp

Browse Source 
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-26 19:09:38 +01:00
parent 805986811a 9c75a3c477
commit 591d2ee8b9
6 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/table/settings.ini
View File

@@ -457,6 +457,15 @@ str = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL
strhelp = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_HELPTEXT
strval = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS
[SDT_BOOL]
base = GameSettings
var = construction.enable_build_river
def = false
cat = SC_BASIC
str = STR_CONFIG_SETTING_ENABLE_BUILD_RIVER
strhelp = STR_CONFIG_SETTING_ENABLE_BUILD_RIVER_HELPTEXT
patxname = ""enable_build_river.construction.enable_build_river""
[SDT_VAR]
base = GameSettings
var = construction.terraform_per_64k_frames