(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)

- The only change is that the nsignalsw.grf file is kept and that existing nightlies with PBS signals get those signals converted to combo-signals.

2 files changed, 13 insertions, 26 deletions

diff --git a/docs/landscape.html b/docs/landscape.html
index a11474ee6..92fed219e 100644
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -103,13 +103,12 @@ m5 bit 7 clear: railway track
 <li>m2 bits 7..4: bit clear = signal shows red; same bits as in m3</li>
 <li>OpenTTD bits in m4:
 <table>
-<tr><td nowrap valign=top>bits 2..0: </td><td align=left>type of signal:</td></tr>
-<tr><td nowrap valign=top><tt>000</tt>: </td><td align=left>normal signals</td></tr>
-<tr><td nowrap valign=top><tt>001</tt>: </td><td align=left>pre-signals</td></tr>
-<tr><td nowrap valign=top><tt>010</tt>: </td><td align=left>exit-signals</td></tr>
-<tr><td nowrap valign=top><tt>011</tt>: </td><td align=left>combo-signals</td></tr>
-<tr><td nowrap valign=top><tt>100</tt>: </td><td align=left>PBS signals</td></tr>
-<tr><td nowrap valign=top>bit 3: </td><td align=left>set = semaphore signals, clear = light signals</td></tr>
+<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>
+<tr><td nowrap valign=top><tt>01</tt>: </td><td align=left>pre-signals</td></tr>
+<tr><td nowrap valign=top><tt>10</tt>: </td><td align=left>exit-signals</td></tr>
+<tr><td nowrap valign=top><tt>11</tt>: </td><td align=left>combo-signals</td></tr>
+<tr><td nowrap valign=top>bit 2: </td><td align=left>set = semaphore signals, clear = light signals</td></tr>
 </table></li>
 </ul></li>
 <li>m1: <a href="#OwnershipInfo">owner</a> of the track
@@ -131,11 +130,6 @@ m5 bit 7 clear: railway track
 <tr><td nowrap valign=top><tt>C</tt>&nbsp; </td><td align=left>on snow or desert</td></tr>
 </table></li>
 <li>m3 bits 0..3 = <a name="TrackType">track type</a>: <tt>0</tt> - conventional railway, <tt>1</tt> - monorail, <tt>2</tt> - maglev
-<li>m4 bits 4..7 = Pbs reserved status:
-<table>
-<tr><td nowrap valign=top><tt>bits 4..6</tt>&nbsp; </td><td align=left>'Track'number of reserved track + 1, if this is zero it means nothing is reserved on this tile</td></tr>
-<tr><td nowrap valign=top><tt>bit 7</tt>&nbsp; </td><td align=left>If this is set, then the opposite track ('Track'number^1) is also reserved</td></tr>
-</table></li>
 </ul>
 m5 bits 7 and 6 set: railway depot / checkpoints
 <ul>
@@ -149,7 +143,6 @@ m5 bits 7 and 6 set: railway depot / checkpoints
 <li>m2: For waypoints, index into the array of waypoints.</li>
 <li>m3 bits 0..3 = <a href="#TrackType">track type</a></li>
 <li>m3 bit 4 = use custom sprite (valid only for the checkpoint)</li>
-<li>m3 bit 6 = track on this tile is reserved by pbs</li>
 <li>m4 bits 0..3 = ground type, as per m2 bits 0..3 for railway tiles.</li>
 </ul>
 </td></tr>
@@ -174,7 +167,6 @@ m5 bit 4 set, bits 7..5 clear: level crossing
 <ul>
 <li>m5 bit 3: clear - road in the X direction, set - road in the Y direction (railway track always perpendicular)</li>
 <li>m5 bit 2: set if crossing lights are on</li>
-<li>m5 bit 0: set if rail track is reserved by pbs</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>
@@ -390,7 +382,6 @@ exit towards: <tt>47</tt> - NE, <tt>48</tt> - SE, <tt>49</tt> - SW, <tt>4A</tt>
 <li>m2: index into the <a href="#_StationArray">array of stations</a></li>
 <li>m3 bits 0..3: <a href="#TrackType">track type</a> for railway stations, must be 0 for all the other stations</li>
 <li>m3 bit 4 = use custom sprite (valid only railway stations FOR NOW)</li>
-<li>m3 bit 6 set = track is reserved by pbs (railway stations only)</li>
 <li>m4 = custom station id</li>
 </ul>
 </td></tr>
@@ -561,8 +552,6 @@ m5 bits 7..4 clear: tunnel entrance/exit
 <li>m1: <a href="#OwnershipInfo">owner</a> of the tunnel</li>
 <li>m3 bits 3..0 = <a href="#TrackType">track type</a> for railway tunnel, must be 0 for road tunnel</li>
 <li>m4 bit 7 set = on snow or desert</li>
-<li>m4 bit 0 set = track with 'Track'number 0 is reserved by pbs</li>
-<li>m4 bit 1 set = track with 'Track'number 1 is reserved by pbs</li>
 </ul>
 m5 bit 7 set: bridge
 <ul><li>
@@ -605,8 +594,6 @@ m5 bit 5 set:
 <tr><td nowrap valign=top><tt>A</tt>&nbsp; </td><td align=center>200</td><td align=left>tubular, steel</td></tr>
 </table></li>
 <li>m4 bit 7 set = on snow or desert</li>
-<li>m4 bit 0 set = track with 'Track'number 0 is reserved by pbs</li>
-<li>m4 bit 1 set = track with 'Track'number 1 is reserved by pbs</li>
 </ul>
 </td></tr>
 
diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index 2a062b76f..5ea3a9980 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -70,7 +70,7 @@ 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="free">OOOO OOOO</span> XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO O</span>XXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>
@@ -78,7 +78,7 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">O</span>X<span class="free">OO</span> XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO O</span>XXX</td>
@@ -87,7 +87,7 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">waypoint</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>X<span class="free">O</span>X XXXX</td>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO O</span>XXX</td>
@@ -109,7 +109,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XX<span class="free">O</span>X</td>
+      <td class="bits">XXXX XX<span class="free">OO</span></td>
     </tr>
     <tr>
       <td class="caption">road depot</td>
@@ -145,7 +145,7 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">station</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>X<span class="free">O</span>X XXXX</td>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
@@ -221,7 +221,7 @@ 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="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">X<span class="free">OOO OO</span>XX</td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>
@@ -230,7 +230,7 @@ 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="free">OOOO OOOO</span> <span class="abuse">XXXX XXXX</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">X<span class="free">OOO OO</span>XX</td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>