cpp/openttd-patchpack/source Changeset - r2020:a397a0bd2db6

Changeset - r2020:a397a0bd2db6

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Darkvater - 19 years ago 2005-07-07 22:15:34
darkvater@openttd.org

(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.

3 files changed with 7 insertions and 4 deletions:

docs/landscape_grid.html

lang/english.txt

rail_cmd.c

0 comments (0 inline, 0 general)

docs/landscape_grid.html

➞

Show inline comments

@@ @@ -55,25 +55,25 @@ the array so you can quickly see what is @@
       <td style="white-space: nowrap; text-align: left;">(0) ground</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="style8">OOOO OOOO OOOO OOOO</span></td>
       <td style="white-space: nowrap; text-align: center;"><span class="style7">XXXX <span class="freebits">OOOO OO</span>XX XXXX</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 X<span class="freebits">O</span>XX</span></td>
     </tr>
     <tr>
       <td style="white-space: nowrap; text-align: left;">(1) rail</td>
       <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>
       </span></td>
     </tr>
     <tr>
       <td>
       <ul>
         <li style="white-space: nowrap; text-align: left;">depot/checkpoint</li>
       </ul>
       </td>
       <td style="text-align: center;"><span class="style7">-inherit-</span></td>

lang/english.txt

➞

Show inline comments

@@ @@ -1475,24 +1475,25 @@ STR_101C_BUILD_RAILROAD_BRIDGE @@
 STR_101D_BUILD_RAILROAD_TUNNEL                                  :{BLACK}Build railway tunnel
 STR_101E_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Toggle build/remove for railway track and signals
 STR_101F_BRIDGE_SELECTION_CLICK                                 :{BLACK}Bridge selection - click on your prefered bridge to build it
 STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Select railway depot orientation
 STR_1021_RAILROAD_TRACK                                         :Railway track
 STR_1022_RAILROAD_TRACK_WITH_SIGNALS                            :Railway track with signals
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Railway train depot
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...area is owned by another company
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Railway track with normal signals
 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
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Land sloped in wrong direction for road
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Must remove road first
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Road Construction
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Select Road Bridge
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Can't build road here...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Can't remove road from here...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Road Depot Orientation
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Can't build road vehicle depot here...

rail_cmd.c

➞

Show inline comments

@@ @@ -2144,32 +2144,34 @@ static void ClickTile_Track(TileIndex ti @@
+}
 static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
+{
 	td->owner = GetTileOwner(tile);
 	switch (GetRailTileType(tile)) {
 		case RAIL_TYPE_NORMAL:
 			td->str = STR_1021_RAILROAD_TRACK;
 			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;
+		}
 		case RAIL_TYPE_DEPOT_WAYPOINT:
 		default:
 			td->str = ((_map5[tile] & RAIL_SUBTYPE_MASK) == RAIL_SUBTYPE_DEPOT) ?
 				STR_1023_RAILROAD_TRAIN_DEPOT : STR_LANDINFO_WAYPOINT;
 			break;
+	}
+}
 static void ChangeTileOwner_Track(TileIndex tile, byte old_player, byte new_player)

0 comments (0 inline, 0 general)