|
|
|
@ -2107,12 +2107,25 @@ static void DrawTrackBitsOverlay(TileInfo *ti, TrackBits track, const RailtypeIn
|
|
|
|
|
DrawGroundSprite(image, PAL_NONE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool no_combine = ti->tileh == SLOPE_FLAT && HasBit(rti->flags, RTF_NO_SPRITE_COMBINE);
|
|
|
|
|
SpriteID overlay = GetCustomRailSprite(rti, ti->tile, RTSG_OVERLAY);
|
|
|
|
|
SpriteID ground = GetCustomRailSprite(rti, ti->tile, RTSG_GROUND);
|
|
|
|
|
SpriteID ground = GetCustomRailSprite(rti, ti->tile, no_combine ? RTSG_GROUND_COMPLETE : RTSG_GROUND);
|
|
|
|
|
TrackBits pbs = _settings_client.gui.show_track_reservation ? GetRailReservationTrackBits(ti->tile) : TRACK_BIT_NONE;
|
|
|
|
|
|
|
|
|
|
if (track == TRACK_BIT_NONE) {
|
|
|
|
|
/* Half-tile foundation, no track here? */
|
|
|
|
|
} else if (no_combine) {
|
|
|
|
|
/* Use trackbits as direct index from ground sprite, subtract 1
|
|
|
|
|
* because there is no sprite for no bits. */
|
|
|
|
|
DrawGroundSprite(ground + track - 1, PAL_NONE);
|
|
|
|
|
|
|
|
|
|
/* Draw reserved track bits */
|
|
|
|
|
if (pbs & TRACK_BIT_X) DrawGroundSprite(overlay + RTO_X, PALETTE_CRASH);
|
|
|
|
|
if (pbs & TRACK_BIT_Y) DrawGroundSprite(overlay + RTO_Y, PALETTE_CRASH);
|
|
|
|
|
if (pbs & TRACK_BIT_UPPER) DrawTrackSprite(overlay + RTO_N, PALETTE_CRASH, ti, SLOPE_N);
|
|
|
|
|
if (pbs & TRACK_BIT_LOWER) DrawTrackSprite(overlay + RTO_S, PALETTE_CRASH, ti, SLOPE_S);
|
|
|
|
|
if (pbs & TRACK_BIT_RIGHT) DrawTrackSprite(overlay + RTO_E, PALETTE_CRASH, ti, SLOPE_E);
|
|
|
|
|
if (pbs & TRACK_BIT_LEFT) DrawTrackSprite(overlay + RTO_W, PALETTE_CRASH, ti, SLOPE_W);
|
|
|
|
|
} else if (ti->tileh == SLOPE_NW && track == TRACK_BIT_Y) {
|
|
|
|
|
DrawGroundSprite(ground + RTO_SLOPE_NW, PAL_NONE);
|
|
|
|
|
if (pbs != TRACK_BIT_NONE) DrawGroundSprite(overlay + RTO_SLOPE_NW, PALETTE_CRASH);
|
|
|
|
|