diff options
| author | tron <tron@openttd.org> | 2006-08-08 12:30:55 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-08-08 12:30:55 +0000 |
| commit | eef4faa4e3fd0f663e3cc5d6df1b0ef8d5c0a431 (patch) | |
| tree | c4f4d64e3c82943b53b36fcbc7261bb98950565f | |
| parent | 928e2902ac81daeff479756155ce5abb82cc35a4 (diff) | |
| download | openttd-eef4faa4e3fd0f663e3cc5d6df1b0ef8d5c0a431.tar.xz | |
(svn r5810) Shuffle some constants for clarity and remove a case which cannot occur in DrawFoundation()
| -rw-r--r-- | landscape.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/landscape.c b/landscape.c index 0b083ebc3..46fc11bcd 100644 --- a/landscape.c +++ b/landscape.c @@ -195,7 +195,7 @@ static bool HasFoundationNE(TileIndex tile, Slope slope_here, uint z_here) void DrawFoundation(TileInfo *ti, uint f) { - uint32 sprite_base = SPR_SLOPES_BASE-14; + uint32 sprite_base = SPR_SLOPES_BASE - 15; Slope slope; uint z; @@ -205,24 +205,16 @@ void DrawFoundation(TileInfo *ti, uint f) if (f < 15) { // 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->tileh = SLOPE_FLAT; OffsetGroundSprite(31, 1); } else { // inclined foundation - sprite_base += 14; - -#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 - + AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 1, ti->z); ti->tileh = _inclined_tileh[f - 15]; OffsetGroundSprite(31, 9); } |