Mercurial > hg > openttd
changeset 17883:38d00fac05c8 draft
(svn r22679) -Change [FS#4692] (r22655): [NewGRF] Use a value of 0 to indicate the invalid waterclass in the nearby land info (0x60 ind. tiles, 0x62 houses, objects,...)
| author | planetmaker <planetmaker@openttd.org> |
|---|---|
| date | Thu, 21 Jul 2011 17:17:48 +0000 |
| parents | 28b460d98826 |
| children | 623e8c8a931c |
| files | src/newgrf_commons.cpp |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -447,7 +447,8 @@ uint z; Slope tileh = GetTileSlope(tile, &z); - byte terrain_type = (HasTileWaterClass(tile) ? GetWaterClass(tile) : WATER_CLASS_INVALID) << 5 | GetTerrainType(tile) << 2 | (tile_type == MP_WATER ? 1 : 0) << 1; + /* Return 0 if the tile is a land tile */ + byte terrain_type = (HasTileWaterClass(tile) ? (GetWaterClass(tile) + 1) & 3 : 0) << 5 | GetTerrainType(tile) << 2 | (tile_type == MP_WATER ? 1 : 0) << 1; return tile_type << 24 | z << 16 | terrain_type << 8 | tileh; }