mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r10308) -Codechange: some "cleanup" chunks from B. N. SmatZ!' work on fixing FS#119.

release/0.6
rubidium 2007-06-24 20:06:10 +00:00
parent b17b9351dd
commit 1caa0f7fb7
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/landscape.cpp
View File

@ -252,7 +252,7 @@ void DrawFoundation(TileInfo *ti, uint f)
if (f < 15) { if (f < 15) {
/* leveled foundation /* leveled foundation
* Use the original slope sprites if NW and NE borders should be visible */ * 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); AddSortableSpriteToDraw(sprite_base + f, PAL_NONE, ti->x, ti->y, 16, 16, 7, ti->z);
ti->z += TILE_HEIGHT; ti->z += TILE_HEIGHT;

5
src/rail_cmd.cpp
View File

@ -1289,9 +1289,6 @@ static void DrawTrackBits(TileInfo* ti, TrackBits track)
if (track & TRACK_BIT_LEFT) DrawGroundSprite(rti->base_sprites.single_w, PAL_NONE); 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 (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) static void DrawSignals(TileIndex tile, TrackBits rails)
@ -1340,6 +1337,8 @@ static void DrawTile_Track(TileInfo *ti)
if (HASBIT(_display_opt, DO_FULL_DETAIL)) DrawTrackDetails(ti); 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); if (HasSignals(ti->tile)) DrawSignals(ti->tile, rails);
} else { } else {
/* draw depot/waypoint */ /* draw depot/waypoint */

4
src/tunnelbridge_cmd.cpp
View File

@ -1004,7 +1004,7 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
* it doesn't disappear behind it * it doesn't disappear behind it
*/ */
AddSortableSpriteToDraw( 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) { if (GetBridgeTransportType(ti->tile) == TRANSPORT_ROAD) {
@ -1026,6 +1026,8 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
} }
DrawBridgeMiddle(ti); DrawBridgeMiddle(ti);
} else {
NOT_REACHED();
} }
} }