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

Merge branch 'signal_tunnels_bridges' into jgrpp

Browse Source 
# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h
This commit is contained in:
Jonathan G Rennison
2017-01-30 21:41:20 +00:00
parent 1e1fcc471b d762835903
commit 1e5c788541
6 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/table/settings.ini
View File

@@ -44,6 +44,7 @@ static bool ZoomMinMaxChanged(int32 p1);
static bool MaxVehiclesChanged(int32 p1);
static bool ImprovedBreakdownsSettingChanged(int32 p1);
static bool DayLengthChanged(int32 p1);
static bool SimulatedWormholeSignalsChanged(int32 p1);
#ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1);
@@ -606,7 +607,7 @@ min = 1
max = 16
str = STR_CONFIG_SETTING_SIMULATE_SIGNALS
strval = STR_CONFIG_SETTING_SIMULATE_SIGNALS_VALUE
proc = RedrawScreen
proc = SimulatedWormholeSignalsChanged
from = 0
cat = SC_BASIC
patxname = ""signal_tunnel_bridge.construction.simulated_wormhole_signals""