(svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo

This commit is contained in:
tron
2006-08-06 16:32:49 +00:00
parent fb251d18e0
commit d8b8035f9f
14 changed files with 61 additions and 49 deletions

View File

@@ -176,12 +176,15 @@ static void DrawTile_Unmovable(TileInfo *ti)
}
}
static uint GetSlopeZ_Unmovable(const TileInfo* ti)
static uint GetSlopeZ_Unmovable(TileIndex tile, uint x, uint y)
{
if (IsOwnedLand(ti->tile)) {
return ti->z + GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh);
if (IsOwnedLand(tile)) {
uint z;
uint tileh = GetTileSlope(tile, &z);
return z + GetPartialZ(x & 0xF, y & 0xF, tileh);
} else {
return ti->z + (ti->tileh == SLOPE_FLAT ? 0 : TILE_HEIGHT);
return GetTileMaxZ(tile);
}
}