summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2005-07-07 22:15:34 +0000
committerDarkvater <darkvater@openttd.org>2005-07-07 22:15:34 +0000
commit480ced43c996d11985ff8d33c0e0d4c8787dd072 (patch)
tree81c6b4091a700d0002da79d1b92bedc23f79a7bc
parentedcccb6ab2eeb2e1c586ee8dc66d4cb89fc9bc3f (diff)
downloadopenttd-480ced43c996d11985ff8d33c0e0d4c8787dd072.tar.xz
(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.
-rw-r--r--docs/landscape_grid.html2
-rw-r--r--lang/english.txt1
-rw-r--r--rail_cmd.c8
3 files changed, 7 insertions, 4 deletions
diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index cd4cfdc8a..fd0a3d238 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -64,7 +64,7 @@ the array so you can quickly see what is used and what is not.
<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>
diff --git a/lang/english.txt b/lang/english.txt
index 81cb29d35..d2337eabb 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -1484,6 +1484,7 @@ STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Railway track w
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
diff --git a/rail_cmd.c b/rail_cmd.c
index 796ba88fd..67497dfbf 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -2153,14 +2153,16 @@ static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
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;
}