changeset 2020:99b041d824cf draft

(svn r2529) - Fix: PBS signals showed up as normal signals with the query tool - Update landscape_grid.html to show busy bits used by PBS.
author Darkvater <Darkvater@openttd.org>
date Thu, 07 Jul 2005 22:15:34 +0000
parents 8b609f0faae6
children 07d342a85eea
files docs/landscape_grid.html lang/english.txt rail_cmd.c
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -64,7 +64,7 @@
       <td style="white-space: nowrap; text-align: center;"><span class="style9">XXXX XXXX</span></td>
       <td style="white-space: nowrap; text-align: center;"><span class="style7">XXXX XXXX <span class="freebits">OOOO OOOO</span><br>
       </span></td>
-      <td style="white-space: nowrap; text-align: center;"><span class="style7">XXXX XXXX XX<span class="freebits">O</span>X<span class="freebits"> OOOO</span><br>
+      <td style="white-space: nowrap; text-align: center;"><span class="style7">XXXX XXXX XXXX XXXX</span><br>
       </span></td>
       <td style="white-space: nowrap; text-align: center;"><span class="style7">XXXX XXXX</span></td>
       <td style="white-space: nowrap; text-align: center;"><span class="style7">XXXX XXXX<br>
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -1484,6 +1484,7 @@
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Railway track with pre-signals
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Railway track with exit-signals
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Railway track with combo-signals
+STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Railway track with pbs-signals
 
 
 
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -2153,14 +2153,16 @@
 			break;
 
 		case RAIL_TYPE_SIGNALS: {
-			const StringID signal_type[] = {
+			const StringID signal_type[7] = {
 				STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS,
 				STR_RAILROAD_TRACK_WITH_PRESIGNALS,
 				STR_RAILROAD_TRACK_WITH_EXITSIGNALS,
-				STR_RAILROAD_TRACK_WITH_COMBOSIGNALS
+				STR_RAILROAD_TRACK_WITH_COMBOSIGNALS,
+				STR_RAILROAD_TRACK_WITH_PBSSIGNALS,
+				STR_NULL, STR_NULL
 			};
 
-			td->str = signal_type[_map3_hi[tile] & 0x03];
+			td->str = signal_type[_map3_hi[tile] & 0x7];
 			break;
 		}