Mercurial > hg > openttd
changeset 7043:116bea6834a1 draft
(svn r10308) -Codechange: some "cleanup" chunks from B. N. SmatZ!' work on fixing FS#119.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Sun, 24 Jun 2007 20:06:10 +0000 |
parents | 6ce0b3b18d8e |
children | 1d4218851181 |
files | src/landscape.cpp src/rail_cmd.cpp src/tunnelbridge_cmd.cpp |
diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -252,7 +252,7 @@ if (f < 15) { /* leveled foundation * Use the original slope sprites if NW and NE borders should be visible */ - if (sprite_base == SPR_SLOPES_BASE - 15) sprite_base = SPR_FOUNDATION_BASE; + if (sprite_base == SPR_SLOPES_BASE - 15) sprite_base = SPR_FOUNDATION_BASE; AddSortableSpriteToDraw(sprite_base + f, PAL_NONE, ti->x, ti->y, 16, 16, 7, ti->z); ti->z += TILE_HEIGHT;
--- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1289,9 +1289,6 @@ if (track & TRACK_BIT_LEFT) DrawGroundSprite(rti->base_sprites.single_w, PAL_NONE); if (track & TRACK_BIT_RIGHT) DrawGroundSprite(rti->base_sprites.single_e, PAL_NONE); } - - if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti); - } static void DrawSignals(TileIndex tile, TrackBits rails) @@ -1340,6 +1337,8 @@ if (HASBIT(_display_opt, DO_FULL_DETAIL)) DrawTrackDetails(ti); + if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti); + if (HasSignals(ti->tile)) DrawSignals(ti->tile, rails); } else { /* draw depot/waypoint */
--- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1004,7 +1004,7 @@ * it doesn't disappear behind it */ AddSortableSpriteToDraw( - image, pal, ti->x, ti->y, 16, 16, ti->tileh == SLOPE_FLAT ? 0 : 8, ti->z + image, pal, ti->x, ti->y, 16, 16, ti->tileh == SLOPE_FLAT ? 0 : 1, ti->z ); if (GetBridgeTransportType(ti->tile) == TRANSPORT_ROAD) { @@ -1026,6 +1026,8 @@ } DrawBridgeMiddle(ti); + } else { + NOT_REACHED(); } }