summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-03-02 22:57:47 +0000
committerrubidium <rubidium@openttd.org>2009-03-02 22:57:47 +0000
commit7831346ef8924c757fbd763c225c7b29b665604f (patch)
tree7514d56ab72b15863906486d7256f8e5dd2cef01 /docs
parent6dd3703a4caafff9a56d878ffac6ce322739067d (diff)
downloadopenttd-7831346ef8924c757fbd763c225c7b29b665604f.tar.xz
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
-Feature: allow building road stops on road/tram tracks of competitors.
Diffstat (limited to 'docs')
-rw-r--r--docs/landscape.html46
-rw-r--r--docs/landscape_grid.html38
2 files changed, 40 insertions, 44 deletions
diff --git a/docs/landscape.html b/docs/landscape.html
index c361f4f01..0f953f696 100644
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -514,8 +514,8 @@
<td>
<ul>
<li>m2: Index into the array of towns (owning town for town roads; closest town otherwise, INVALID_TOWN if there is no town or we are creating a town)</li>
- <li>m3 bit 7 set = on snow or desert</li>
- <li>m7 bits 7..5: present road types
+ <li>m7 bit 5 set = on snow or desert</li>
+ <li>m7 bits 7..6: present road types
<table>
<tr>
<td>bit 0&nbsp; </td>
@@ -526,16 +526,11 @@
<td>bit 1&nbsp; </td>
<td>tram</td>
</tr>
-
- <tr>
- <td>bit 2&nbsp; </td>
- <td>reserved</td>
- </tr>
</table>
</li>
<li>m5 bits 7 clear: road or level-crossing
<ul>
- <li>m3 bits 6..4:
+ <li>m6 bits 5..3:
<table>
<tr>
<td><tt>0</tt>&nbsp; </td>
@@ -567,13 +562,12 @@
</tr>
</table>
</li>
- <li>m5 bits 3..0: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
- <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road type 2 (reserved)
+ <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
<li>m5 bit 6 clear: road
<ul>
<li>m1: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
- <li>m3 bits 3..0: counter for the roadworks</li>
- <li>m4 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
+ <li>m7 bits 3..0: counter for the roadworks</li>
+ <li>m5 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
<table>
<tr>
<td align=left>bit 0: </td>
@@ -593,8 +587,7 @@
</tr>
</table>
</li>
- <li>m4 bits 7..4: road layout road type 1 (tram)</li>
- <li>m6 bits 5..2: road layout road type 2 (reserved)</li>
+ <li>m3 bits 0..3: road layout road type 1 (tram)</li>
<li>m5 bits 5..4: bits to disallow vehicles to go a specific direction
<table>
<tr>
@@ -613,7 +606,7 @@
<ul>
<li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
<li>m3 bits 3..0: <a href="#TrackType">railway track type</a></li>
- <li>m4 bit 6: direction
+ <li>m5 bit 0: direction
<table>
<tr>
<td align=left><tt>0</tt>&nbsp; </td>
@@ -625,8 +618,8 @@
</tr>
</table>
</li>
- <li>m4 bit 5: set if crossing lights are on</li>
- <li>m4 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
+ <li>m5 bit 5: set if crossing lights are on</li>
+ <li>m6 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
<li>m5 bit 4: pbs reservation state</li>
</ul>
</li>
@@ -842,9 +835,9 @@
<ul>
<li>m1: <a href="#OwnershipInfo">owner</a> of the station</li>
<li>m2: index into the array of stations</li>
- <li>m3 bits 7..4: persistent random data for newstations</li>
+ <li>m3 bits 7..4: persistent random data for newstations (train station)</li>
+ <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
<li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations</li>
- <li>m3 bits 2..0: present road types for road stops</li>
<li>m3 bits 1..0: water class for buoys and water part of docks</li>
<li>m4: custom station id; 0 means standard graphics</li>
<li>m5: graphics index (range from 0..255 for each station type):
@@ -943,10 +936,12 @@
</table>
</li>
<li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy)</li>
- <li>m6 bit 2: 1 when a drive through road stop is built over a town owned road, otherwise 0</li>
<li>m6 bit 2: pbs reservation state for railway stations</li>
+
<li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
- <li>m7: animation frame</li>
+ <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
+ <li>m7 bits 7..6: present road types (road stops)</li>
+ <li>m7: animation frame (train station)</li>
</ul>
</td>
</tr>
@@ -1413,15 +1408,13 @@
<td>
<ul>
<li>m1: <a href="#OwnershipInfo">owner</a></li>
- <li>m2 bits 7..4: see bridge ramp</li>
+ <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>m3 bits 2..0: present road types for road</li>
- <li>m4 bit 7 set = on snow or desert</li>
<li>m5 bit 4: pbs reservation state for railway</li>
<li>m5 bits 7 clear: tunnel entrance/exit</li>
<li>m5 bit 7 set: bridge ramp
<ul>
- <li>m2 bits 7..4: <a name="BridgeType">bridge type</a>:
+ <li>m6 bits 5..2: <a name="BridgeType">bridge type</a>:
<table>
<tr>
<th align=left>Type&nbsp;</th>
@@ -1552,6 +1545,9 @@
</li>
<li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
<li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
+ <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road</li>
+ <li>m7 bit 5 set = on snow or desert</li>
+ <li>m7 bits 7..6: present road types for road</li>
</ul>
</td>
</tr>
diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index 1b33f51a9..cc87cf2ad 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -137,10 +137,10 @@ the array so you can quickly see what is used and what is not.
<td class="bits"><span class="option">~~~</span>X XXXX</td>
<td class="bits">XXXX XXXX XXXX XXXX</td>
<td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits">XXXX X<span class="free">O</span>XX</td>
+ <td class="bits">XXX<span class="free">O</span> XXXX</td>
</tr>
<tr>
<td class="caption">level crossing</td>
@@ -148,17 +148,17 @@ the array so you can quickly see what is used and what is not.
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
<td class="bits">XXXX <span class="option">~~</span>XX</td>
- <td class="bits"><span class="free">O</span>XXX XXXX</td>
- <td class="bits">XX<span class="free">O</span>X XXXX</td>
- <td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits">-inherit-</td>
+ <td class="bits">XXXX<span class="free"> OOO</span>X</td>
+ <td class="bits">XXXX X<span class="free">O</span>XX</td>
+ <td class="bits">XXXX XXXX</td>
</tr>
<tr>
<td class="caption">road depot</td>
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
- <td class="bits">X<span class="free">OOO OOOO</span></td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -205,11 +205,11 @@ the array so you can quickly see what is used and what is not.
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
- <td class="bits"><span class="free">OOOO O</span>XXX</td>
+ <td class="bits">XXXX XXXX</td>
<td class="bits"><span class="option">~~~~ ~~~~</span></td>
<td class="bits"><span class="option">~~~~ ~</span>XXX</td>
<td class="bits"><span class="free">OO</span>XX XXXX</td>
- <td class="bits"><span class="free">OOOO OOOO</span></td>
+ <td class="bits">XXXX X<span class="free">O</span>XX</td>
</tr>
<tr>
<td class="caption">dock</td>
@@ -308,22 +308,22 @@ the array so you can quickly see what is used and what is not.
<td class="bits">XXXX XXXX</td>
<td class="bits"><span class="option">~~~</span>X XXXX</td>
<td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
- <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
- <td class="bits">X<span class="free">OOO OOOO</span></td>
- <td class="bits">X<span class="free">OO</span>X <span class="option">~</span>XXX</td>
- <td class="bits">XX<span class="free">OO OO</span>XX</td>
+ <td class="bits">XXXX <span class="option">~~</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
+ <td class="bits">X<span class="free">OO</span>X XXXX</td>
+ <td class="bits">XX<span class="free">OO OO</span>XX</td>
+ <td class="bits">XXXX X<span class="free">O</span>XX</td>
</tr>
<tr>
<td>bridge ramp</td>
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
- <td class="bits"><span class="free">OOOO OOOO</span> XXXX <span class="free">OOOO</span></td>
- <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
- <td class="bits">X<span class="free">OOO OOOO</span></td>
- <td class="bits">X<span class="free">OO</span>X XXXX</td>
- <td class="bits">XX<span class="free">OO OO</span>XX</td>
- <td class="bits"><span class="free">OOOO OOOO</span></td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">XXXX XXXX</td>
+ <td class="bits">-inherit-</td>
</tr>
<tr>
<td rowspan=2>A</td>