cpp/openttd-patchpack/source Changeset - r22048:48340dbb02c2

Changeset - r22048:48340dbb02c2

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 9 years ago 2015-03-28 14:04:06
frosch@openttd.org

(svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads.

3 files changed with 26 insertions and 4 deletions:

src/pbs.cpp

src/train_cmd.cpp

src/tunnelbridge_cmd.cpp

0 comments (0 inline, 0 general)

src/pbs.cpp

➞

Show inline comments

@@ @@ -85,7 +85,11 @@ bool TryReserveRailTrack(TileIndex tile, @@
 	if (_settings_client.gui.show_track_reservation) {
 		/* show the reserved rail if needed */
 		MarkTileDirtyByTile(tile);
 		if (IsBridgeTile(tile)) {
 			MarkBridgeDirty(tile);
 		} else {
 			MarkTileDirtyByTile(tile);
+		}
+	}
 	switch (GetTileType(tile)) {
@@ @@ -141,7 +145,11 @@ void UnreserveRailTrack(TileIndex tile, @@
 	assert((GetTileTrackStatus(tile, TRANSPORT_RAIL, 0) & TrackToTrackBits(t)) != 0);
 	if (_settings_client.gui.show_track_reservation) {
 		MarkTileDirtyByTile(tile);
 		if (IsBridgeTile(tile)) {
 			MarkBridgeDirty(tile);
 		} else {
 			MarkTileDirtyByTile(tile);
+		}
+	}
 	switch (GetTileType(tile)) {

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -2216,8 +2216,12 @@ static void ClearPathReservation(const T @@
 				SetTunnelBridgeReservation(end, false);
 				if (_settings_client.gui.show_track_reservation) {
 					MarkTileDirtyByTile(tile);
 					MarkTileDirtyByTile(end);
 					if (IsBridge(tile)) {
 						MarkBridgeDirty(tile);
 					} else {
 						MarkTileDirtyByTile(tile);
 						MarkTileDirtyByTile(end);
+					}
+				}
+			}
+		}

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -1481,6 +1481,16 @@ void DrawBridgeMiddle(const TileInfo *ti @@
 				AddSortableSpriteToDraw(surface + axis, PAL_NONE, x, y, 16, 16, 0, bridge_z, IsTransparencySet(TO_BRIDGES));
+			}
+		}
 		if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && !IsInvisibilitySet(TO_BRIDGES) && HasTunnelBridgeReservation(rampnorth)) {
 			if (rti->UsesOverlay()) {
 				SpriteID overlay = GetCustomRailSprite(rti, ti->tile, RTSG_OVERLAY);
 				AddSortableSpriteToDraw(overlay + RTO_X + axis, PALETTE_CRASH, ti->x, ti->y, 16, 16, 0, bridge_z, IsTransparencySet(TO_BRIDGES));
 			} else {
 				AddSortableSpriteToDraw(axis == AXIS_X ? rti->base_sprites.single_x : rti->base_sprites.single_y, PALETTE_CRASH, ti->x, ti->y, 16, 16, 0, bridge_z, IsTransparencySet(TO_BRIDGES));
+			}
+		}
 		EndSpriteCombine();
 		if (HasCatenaryDrawn(GetRailType(rampsouth))) {

0 comments (0 inline, 0 general)