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

(svn r5810) Shuffle some constants for clarity and remove a case which cannot occur in DrawFoundation()

release/0.5
tron 2006-08-08 12:30:55 +00:00
parent f94a754c14
commit b9c47a1867
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
landscape.c
View File

@ -195,7 +195,7 @@ static bool HasFoundationNE(TileIndex tile, Slope slope_here, uint z_here)
void DrawFoundation(TileInfo *ti, uint f) void DrawFoundation(TileInfo *ti, uint f)
{ {
uint32 sprite_base = SPR_SLOPES_BASE-14; uint32 sprite_base = SPR_SLOPES_BASE - 15;
Slope slope; Slope slope;
uint z; uint z;
@ -205,24 +205,16 @@ void DrawFoundation(TileInfo *ti, uint f)
if (f < 15) { if (f < 15) {
// leveled foundation // leveled foundation
if (sprite_base < SPR_SLOPES_BASE) sprite_base = SPR_FOUNDATION_BASE + 1; // use original slope sprites // 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;
AddSortableSpriteToDraw(f - 1 + sprite_base, ti->x, ti->y, 16, 16, 7, ti->z); AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 7, ti->z);
ti->z += TILE_HEIGHT; ti->z += TILE_HEIGHT;
ti->tileh = SLOPE_FLAT; ti->tileh = SLOPE_FLAT;
OffsetGroundSprite(31, 1); OffsetGroundSprite(31, 1);
} else { } else {
// inclined foundation // inclined foundation
sprite_base += 14; AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 1, ti->z);
#define M(x) (1 << (x))
AddSortableSpriteToDraw(
HASBIT(M(SLOPE_W) | M(SLOPE_S) | M(SLOPE_E) | M(SLOPE_N), ti->tileh) ?
sprite_base + (f - 15) : SPR_FOUNDATION_BASE + ti->tileh,
ti->x, ti->y, 16, 16, 1, ti->z
);
#undef M
ti->tileh = _inclined_tileh[f - 15]; ti->tileh = _inclined_tileh[f - 15];
OffsetGroundSprite(31, 9); OffsetGroundSprite(31, 9);
} }