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

(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,...)

release/1.2
planetmaker 2011-07-21 17:17:48 +00:00
parent e3d9879690
commit e188edd8f6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf_commons.cpp
View File

@ -447,7 +447,8 @@ uint32 GetNearbyTileInformation(TileIndex tile)
uint z; uint z;
Slope tileh = GetTileSlope(tile, &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; return tile_type << 24 | z << 16 | terrain_type << 8 | tileh;
} }