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:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
This commit is contained in:
Jonathan G Rennison
2016-09-18 20:07:48 +01:00
parent 201294c16e 556594f2f0
commit f82feb160f
26 changed files with 467 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
docs/landscape.html
View File

@@ -1447,7 +1447,7 @@
<li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</li>
<li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway</li>
<li>m5 bit 4: pbs reservation state for railway</li>
<li>m5 bits 7 clear: tunnel entrance/exit</li>
<li>m5 bit 7 clear: tunnel entrance/exit</li>
<li>m5 bit 7 set: bridge ramp
<ul>
<li>m6 bits 5..2: <a name="BridgeType">bridge type</a>:
@@ -1539,6 +1539,32 @@
</li>
</ul>
</li>
<li style="color: blue">m5 bits 6..5: signal simulation (signals on bridge/tunnels patch)
<table style="color: blue">
<tr>
<td><tt>0</tt>&nbsp;</td>
<td>no signal simulation</td>
</tr>
<tr>
<td><tt>1</tt>&nbsp;</td>
<td>signal simulation entrance (bit 5 set)</td>
</tr>
<tr>
<td><tt>2</tt>&nbsp;</td>
<td>signal simulation exit (bit 6 set)</td>
</tr>
</table>
If signal simulation entrance or exit:
<ul>
<li>m6 bit 6: set = PBS signals, clear = block signals</li>
<li>m6 bit 1: set = semaphore signals, clear = light signals</li>
<li>m6 bit 0: set = signal shows green, clear = signal shows red</li>
<li>m2 bit 15: for bridge entrances only: storage for visual red/green state of signals starting from 15 is allocated outside the map array</li>
<li>m2 bits 14..0: for bridge entrances only: for signals 0..14 on bridge, signal is visually red if corresponding bit in 0..14 is set</li>
</ul>
</li>
<li>m5 bits 3..2: transport type
<table>
<tr>