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

Merge branch 'custom_bridgeheads' into jgrpp

Browse Source 
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
This commit is contained in:
Jonathan G Rennison
2017-02-05 20:43:56 +00:00
parent 9782d70c53 079a5a66da
commit 072915f2c7
20 changed files with 475 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
docs/landscape.html
View File

@@ -1453,6 +1453,36 @@
<ul>
<li style="color: blue">m1 bit 7: bit 4 of <a href="#TrackType">track type</a> for railway (more rail types patch)</li>
<li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a></li>
<li style="color: blue">m2 bits 7..0: custom road bridge heads (flat bridge heads only)<br>
Road/tram bits below are XORed with the axial bridge direction road bits.<br>
A non-custom bridge head configuration will have a value of 0.
<ul>
<li>m2 bits 7..4: Road bits<br>
Valid only if m7 bit 6 is set
</li>
<li>m2 bits 3..0: Tram bits<br>
Valid only if m7 bit 7 is set
</li>
</ul>
<table style="color: blue">
<tr>
<td align=left>bit 0: </td>
<td>NW piece</td>
</tr>
<tr>
<td align=left>bit 1: </td>
<td>SW piece</td>
</tr>
<tr>
<td align=left>bit 2: </td>
<td>SE piece</td>
</tr>
<tr>
<td align=left>bit 3: </td>
<td>NE piece</td>
</tr>
</table>
</li>
<li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</li>
<li style="color: purple">m3 bits 3..0: bits 3..0 of <a href="#TrackType">track type</a> for railway</li>
<li>m5 bit 4: pbs reservation state for railway</li>