From bbde9225f4ff800c0f5e4324050b690119e65b31 Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 27 Jan 2005 15:30:34 +0000 Subject: [PATCH] (svn r1697) Remove superflous special case for the VOID border tiles in FindLandscapeHeightByTile() While here clean up some other stuff: uint -> TileIndex, assert() that the TileIndex is valid and remove a line which was already commented out --- landscape.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/landscape.c b/landscape.c index 4d88353436..18e51ebd6e 100644 --- a/landscape.c +++ b/landscape.c @@ -80,22 +80,14 @@ int GetTileZ(uint tile) return h; } -void FindLandscapeHeightByTile(TileInfo *ti, uint tile) +void FindLandscapeHeightByTile(TileInfo *ti, TileIndex tile) { - if (TileX(tile) == MapMaxX() || TileY(tile) == MapMaxY()) { - ti->tileh = 0; - ti->type = MP_VOID; - ti->tile = 0; - ti->map5 = 0; - ti->z = 0; - return; - } + assert(tile < MapSize()); ti->tile = tile; ti->map5 = _map5[tile]; ti->type = TileType(tile); ti->tileh = GetTileSlope(tile, &ti->z); -// ti->z = min * 8; } /* find the landscape height for the coordinates x y */