(svn r16911) -Update: map array documentation

2 files changed, 36 insertions, 39 deletions

diff --git a/docs/landscape.html b/docs/landscape.html
index 0f953f696..c6847e0c7 100644
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -183,7 +183,7 @@
    <td>
     <ul>
      <li>m1: <a href="#OwnershipInfo">owner</a> of the tile</li>
-     <li>m2: see waypoint and signals</li>
+     <li>m2: see signals</li>
      <li>m3 bits 7..4: see signals</li>
      <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
       <table>
@@ -452,25 +452,6 @@
        <li>m2 bit 11: opposite track is reserved, too</li>
       </ul>
      </li>
-     <li>m5 bit 7 set, bit 6 clear: checkpoint
-      <ul>
-       <li>m2: index into the array of waypoints.</li>
-       <li>m5 bit 0:
-        <table>
-         <tr>
-          <td><tt>0</tt>&nbsp; </td>
-          <td>in X direction</td>
-         </tr>
-
-         <tr>
-          <td><tt>1</tt>&nbsp; </td>
-          <td>in Y direction</td>
-         </tr>
-        </table>
-       </li>
-       <li>m5 bit 4: pbs reservation state</li>
-      </ul>
-     </li>
      <li>m5 bit 7 set, bit 6 set: railway depot
       <ul>
        <li>m5 bits 1..0: exit towards
@@ -835,9 +816,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 (train station)</li>
+     <li>m3 bits 7..4: persistent random data for newstations (railway stations/waypoints)</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 3..0: <a href="#TrackType">track type</a> for railway stations/waypoints</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):
@@ -866,13 +847,29 @@
        </tr>
 
        <tr>
+        <td nowrap valign=top><tt>00</tt>..<tt>01</tt></td>
+        <td align=left>waypoints
+         <table>
+          <tr>
+           <td><tt>00</tt>&nbsp; </td>
+           <td align=left>in X direction</td>
+          </tr>
+          <tr>
+           <td><tt>01</tt>&nbsp; </td>
+           <td align=left>in Y direction</td>
+          </tr>
+         </table>
+        </td>
+       </tr>
+
+       <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>8F</tt></td>
         <td align=left>all airports</td>
        </tr>
 
        <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>05</tt>&nbsp; </td>
-        <td align=left>road stops:
+        <td align=left>road stops
          <table>
           <tr>
            <td><tt>00</tt>&nbsp; </td>
@@ -935,13 +932,13 @@
        </tr>
       </table>
      </li>
-     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy)</li>
-     <li>m6 bit 2: pbs reservation state for railway stations</li>
+     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint)</li>
+     <li>m6 bit 2: pbs reservation state for railway stations/waypoints</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 (road stops)</li>
      <li>m7 bits 7..6: present road types (road stops)</li>
-     <li>m7: animation frame (train station)</li>
+     <li>m7: animation frame (railway stations/waypoints)</li>
     </ul>
    </td>
   </tr>
diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index d6a712e7e..ac2671005 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -86,7 +86,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
-      <td rowspan=4>1</td>
+      <td rowspan=3>1</td>
       <td class="caption">rail</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~</span>X XXXX</td>
@@ -120,17 +120,6 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
-      <td class="caption">waypoint</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X <span class="free">OOO</span>X</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
       <td rowspan=3>2</td>
       <td class="caption">road</td>
       <td class="bits">XXXX XXXX</td>
@@ -189,7 +178,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
-      <td rowspan=6>5</td>
+      <td rowspan=7>5</td>
       <td class="caption">rail station</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~</span>X XXXX</td>
@@ -201,6 +190,17 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
+      <td class="caption">rail waypoint</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+    </tr>
+    <tr>
       <td class="caption">road stop</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>