# HG changeset patch # User frosch # Date 2011-08-28 20:33:40 # Node ID bfce2d315c237be634e04b268b7af90bed6b183f # Parent d57fb8a9c9a40f36a006b7355ccfff494bfe1ce5 (svn r22854) -Change: [NewGRF] Allow replacing depot sprites without having to provide rail overlays. (Hirundo) diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -2284,9 +2284,6 @@ static void DrawTile_Track(TileInfo *ti) default: break; } } - - int depot_sprite = GetCustomRailSprite(rti, ti->tile, RTSG_DEPOT); - relocation = depot_sprite != 0 ? depot_sprite - SPR_RAIL_DEPOT_SE_1 : rti->GetRailtypeSpriteOffset(); } else { /* PBS debugging, draw reserved tracks darker */ if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && HasDepotReservation(ti->tile)) { @@ -2298,9 +2295,9 @@ static void DrawTile_Track(TileInfo *ti) default: break; } } - - relocation = rti->GetRailtypeSpriteOffset(); } + int depot_sprite = GetCustomRailSprite(rti, ti->tile, RTSG_DEPOT); + relocation = depot_sprite != 0 ? depot_sprite - SPR_RAIL_DEPOT_SE_1 : rti->GetRailtypeSpriteOffset(); if (HasCatenaryDrawn(GetRailType(ti->tile))) DrawCatenary(ti); @@ -2332,10 +2329,9 @@ void DrawTrainDepotSprite(int x, int y, case DIAGDIR_SE: DrawSprite(ground + RTO_Y, PAL_NONE, x, y); break; default: break; } - - int depot_sprite = GetCustomRailSprite(rti, INVALID_TILE, RTSG_DEPOT); - if (depot_sprite != 0) offset = depot_sprite - SPR_RAIL_DEPOT_SE_1; } + int depot_sprite = GetCustomRailSprite(rti, INVALID_TILE, RTSG_DEPOT); + if (depot_sprite != 0) offset = depot_sprite - SPR_RAIL_DEPOT_SE_1; DrawRailTileSeqInGUI(x, y, dts, offset, 0, palette); }