Mercurial > hg > openttd
changeset 18039:97c516ab011f draft
(svn r22854) -Change: [NewGRF] Allow replacing depot sprites without having to provide rail overlays. (Hirundo)
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Sun, 28 Aug 2011 20:33:40 +0000 |
| parents | 2795d098c510 |
| children | edc56f146366 |
| files | src/rail_cmd.cpp |
| diffstat | 1 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -2284,9 +2284,6 @@ 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 @@ 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 @@ 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); }