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

Merge branch 'signal_tunnels_bridges-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
	src/signal.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:45:32 +01:00
parent 8271acadb7 09aa29de8b
commit 27c70542da
13 changed files with 613 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/table/settings.ini
View File

@@ -543,6 +543,21 @@ str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH
strhelp = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT
strval = STR_CONFIG_SETTING_TILE_LENGTH
[SDT_VAR]
base = GameSettings
var = construction.simulated_wormhole_signals
type = SLE_UINT8
flags = 0
def = 2
min = 1
max = 16
str = STR_CONFIG_SETTING_SIMULATE_SIGNALS
strval = STR_CONFIG_SETTING_SIMULATE_SIGNALS_VALUE
proc = RedrawScreen
from = 0
cat = SC_BASIC
patxname = ""signal_tunnel_bridge.construction.simulated_wormhole_signals""
# construction.longbridges
[SDT_NULL]
length = 1