summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2008-09-11 21:53:59 +0000
committersmatz <smatz@openttd.org>2008-09-11 21:53:59 +0000
commit37edc141e2f9d398bbd4bb3b705b15dc8d04bb3d (patch)
treec6fc723acaebe7ffe523324c38db25f97a85a106 /src
parent80b0671cc9dbb477cbba83f75818ee3f2616af77 (diff)
downloadopenttd-37edc141e2f9d398bbd4bb3b705b15dc8d04bb3d.tar.xz
(svn r14293) -Change: do not show PBS track reservation in the intro game
Diffstat (limited to 'src')
-rw-r--r--src/rail_cmd.cpp6
-rw-r--r--src/road_cmd.cpp2
-rw-r--r--src/station_cmd.cpp2
-rw-r--r--src/tunnelbridge_cmd.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index b101934e4..12af30861 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -1802,7 +1802,7 @@ static void DrawTrackBits(TileInfo* ti, TrackBits track)
}
/* PBS debugging, draw reserved tracks darker */
- if (_settings_client.gui.show_track_reservation) {
+ if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation) {
TrackBits pbs = GetTrackReservation(ti->tile);
if (pbs & TRACK_BIT_X) {
if (ti->tileh == SLOPE_FLAT || ti->tileh == SLOPE_ELEVATED) {
@@ -1839,7 +1839,7 @@ static void DrawTrackBits(TileInfo* ti, TrackBits track)
}
DrawGroundSprite(image, pal, &(_halftile_sub_sprite[halftile_corner]));
- if (_settings_client.gui.show_track_reservation && IsSteepSlope(ti->tileh) && HasReservedTracks(ti->tile, CornerToTrackBits(halftile_corner))) {
+ if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && IsSteepSlope(ti->tileh) && HasReservedTracks(ti->tile, CornerToTrackBits(halftile_corner))) {
static const byte _corner_to_track_sprite[] = {3, 1, 2, 0};
AddSortableSpriteToDraw(_corner_to_track_sprite[halftile_corner] + rti->base_sprites.single_n, PALETTE_CRASH, ti->x, ti->y, 16, 16, 0, ti->z + 16);
}
@@ -1988,7 +1988,7 @@ default_waypoint:
DrawGroundSprite(image, PAL_NONE);
/* PBS debugging, draw reserved tracks darker */
- if (_settings_client.gui.show_track_reservation && GetDepotWaypointReservation(ti->tile)) {
+ if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && GetDepotWaypointReservation(ti->tile)) {
DrawGroundSprite(GetWaypointAxis(ti->tile) == AXIS_X ? rti->base_sprites.single_y : rti->base_sprites.single_x, PALETTE_CRASH);
}
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index cea81bca7..900dbbd1a 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -1183,7 +1183,7 @@ static void DrawTile_Road(TileInfo *ti)
DrawGroundSprite(image, pal);
/* PBS debugging, draw reserved tracks darker */
- if (_settings_client.gui.show_track_reservation && GetCrossingReservation(ti->tile)) {
+ if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && GetCrossingReservation(ti->tile)) {
DrawGroundSprite(GetCrossingRoadAxis(ti->tile) == AXIS_Y ? GetRailTypeInfo(GetRailType(ti->tile))->base_sprites.single_y : GetRailTypeInfo(GetRailType(ti->tile))->base_sprites.single_x, PALETTE_CRASH);
}
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index f9274a643..0a1eedb5c 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2267,7 +2267,7 @@ static void DrawTile_Station(TileInfo *ti)
DrawGroundSprite(image, HasBit(image, PALETTE_MODIFIER_COLOR) ? palette : PAL_NONE);
/* PBS debugging, draw reserved tracks darker */
- if (_settings_client.gui.show_track_reservation && IsRailwayStation(ti->tile) && GetRailwayStationReservation(ti->tile)) {
+ if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && IsRailwayStation(ti->tile) && GetRailwayStationReservation(ti->tile)) {
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
DrawGroundSprite(GetRailStationAxis(ti->tile) == AXIS_X ? rti->base_sprites.single_y : rti->base_sprites.single_x, PALETTE_CRASH);
}
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index 1115003f3..9abe9435f 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -905,7 +905,7 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
DrawGroundSprite(image, PAL_NONE);
/* PBS debugging, draw reserved tracks darker */
- if (_settings_client.gui.show_track_reservation && (transport_type == TRANSPORT_RAIL && GetTunnelBridgeReservation(ti->tile))) {
+ if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && (transport_type == TRANSPORT_RAIL && GetTunnelBridgeReservation(ti->tile))) {
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
DrawGroundSprite(DiagDirToAxis(tunnelbridge_direction) == AXIS_X ? rti->base_sprites.single_y : rti->base_sprites.single_x, PALETTE_CRASH);
}