(svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType.

2 files changed, 14 insertions, 14 deletions

diff --git a/docs/landscape.html b/docs/landscape.html
index 518980a09..64862aef4 100644
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -125,7 +125,7 @@
           </ul>
          </li>
          <li>m2 bits 7..4: bit clear = signal shows red; same bits as in m3</li>
-         <li>OpenTTD bits in m4:
+         <li>OpenTTD bits in m2:
           <table>
            <tr><td nowrap valign=top>bits 1..0: </td><td align=left>type of signal:</td></tr>
            <tr><td nowrap valign=top><tt>00</tt>: </td><td align=left>normal signals</td></tr>
@@ -138,7 +138,7 @@
         </ul>
        </li>
        <li>m1: <a href="#OwnershipInfo">owner</a> of the track</li>
-       <li>m2 bits 0..3:
+       <li>m4 bits 0..3:
         <table>
          <tr><td nowrap valign=top><tt>0</tt>&nbsp; </td><td align=left>on bare land</td></tr>
          <tr><td nowrap valign=top><tt>1</tt>&nbsp; </td><td align=left>on grass, no fences</td></tr>
@@ -165,7 +165,7 @@
        </li>
       </ul>
      </li>
-     <li>m5 bits 7 and 6 set: railway depot / checkpoints
+     <li>m5 bit 7 set: railway depot / checkpoints
       <ul>
        <li>m5 value C0..C3: railway depot
         <table>
@@ -177,7 +177,7 @@
          <tr><td><tt>03</tt>&nbsp; </td><td>NW</td></tr>
         </table>
        </li>
-       <li>m5 value C4..C5: checkpoint
+       <li>m5 value 80..81: checkpoint
         <table>
          <tr><td colspan=2>bit 0</td></tr>
          <tr><td>clear</td><td>in X direction</td></tr>
@@ -187,7 +187,7 @@
        <li>m1: <a href="#OwnershipInfo">owner</a> of the depot / checkpoint</li>
        <li>m2: For waypoints, index into the array of waypoints.</li>
        <li>m3 bits 0..3 = <a href="#TrackType">track type</a></li>
-       <li>m4 bits 0..3 = ground type, as per m2 bits 0..3 for railway tiles.</li>
+       <li>m4 bits 0..3 = ground type, as per m4 bits 0..3 for railway tiles.</li>
       </ul>
      </li>
     </ul>
@@ -210,8 +210,8 @@
       </li>
       <li>m1: <a href="#OwnershipInfo">owner</a> of the road</li>
       <li>m2: Index into the array of towns, 0 for non-town roads</li>
-      <li>m4 bits 0..3: counter for the roadworks</li>
-      <li>m4 bits 4..6:
+      <li>m3 bits 0..3: counter for the roadworks</li>
+      <li>m3 bits 4..6:
        <table>
         <tr><td><tt>0</tt>&nbsp; </td><td>on bare land</td></tr>
         <tr><td><tt>1</tt>&nbsp; </td><td>on grass</td></tr>
@@ -222,7 +222,7 @@
         <tr><td><tt>7</tt>&nbsp; </td><td>paved with road works</td></tr>
        </table>
       </li>
-      <li>m4 bit 7 set = on snow or desert</li>
+      <li>m3 bit 7 set = on snow or desert</li>
      </ul>
     </li>
     <li>m5 bit 4 set, bits 7..5 clear: level crossing
@@ -231,17 +231,17 @@
       <li>m5 bit 2: set if crossing lights are on</li>
       <li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
       <li>m2: Index into the array of towns, 0 for non-town roads</li>
-      <li>m3 bits 0..7: <a href="#OwnershipInfo">owner</a> of the road</li>
-      <li>m4 bits 3..0: <a href="#TrackType">track type</a></li>
-      <li>m4 bits 4..6: <tt>0</tt> - on bare land, <tt>1</tt> - on grass, <tt>2</tt> or higher - paved</li>
-      <li>m4 bit 7 set = on snow or desert</li>
+      <li>m4 bits 0..7: <a href="#OwnershipInfo">owner</a> of the road</li>
+      <li>m3 bits 3..0: <a href="#TrackType">track type</a></li>
+      <li>m3 bits 4..6: <tt>0</tt> - on bare land, <tt>1</tt> - on grass, <tt>2</tt> or higher - paved</li>
+      <li>m3 bit 7 set = on snow or desert</li>
      </ul>
     </li>
     <li>m5 bit 5 set: road depot
       <ul>
        <li>m5 bits 3..0 - direction: exit towards: <tt>0</tt> = NE, <tt>1</tt> = SE, <tt>2</tt> = SW, <tt>3</tt> = NW</li>
        <li>m1: <a href="#OwnershipInfo">owner</a> of the depot</li>
-       <li>m4 bit 7 set = on snow or desert (not displayed, but set internally)</li>
+       <li>m3 bit 7 set = on snow or desert (not displayed, but set internally)</li>
       </ul>
      </li>
     </ul>
diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index 83d7e77fb..2d9196f3b 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -135,8 +135,8 @@ 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"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></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">XXXX XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
     </tr>