dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhanced viewports: Fix bug in previous fix for aqueducts in viewport map mode.

Browse Source 
Tile type tests were being performed on the wrong tile index.
This fixes commit 5540374227.
This commit is contained in:
Jonathan G Rennison
2015-09-18 22:12:58 +01:00
parent 388dab7390
commit 6e3b3c04de
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/viewport.cpp
View File

@@ -1931,7 +1931,7 @@ static inline uint32 ViewportMapGetColourVegetation(const TileIndex tile, TileTy
case MP_WATER: case MP_WATER:
if (is_32bpp) { if (is_32bpp) {
uint slope_index = 0; uint slope_index = 0;
if (IsTileType(t, MP_WATER) && GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index); if (IsTileType(tile, MP_WATER) && GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index);
return _vp_map_water_colour[slope_index]; return _vp_map_water_colour[slope_index];
} }
/* FALL THROUGH */ /* FALL THROUGH */
@@ -1969,7 +1969,7 @@ static inline uint32 ViewportMapGetColourIndustries(const TileIndex tile, const
if (is_32bpp && t2 == MP_WATER) { if (is_32bpp && t2 == MP_WATER) {
uint slope_index = 0; uint slope_index = 0;
if (t != MP_INDUSTRY && IsTileType(t, MP_WATER) && GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index); ///< Ignore industry on water not shown on map. if (t != MP_INDUSTRY && IsTileType(tile, MP_WATER) && GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index); ///< Ignore industry on water not shown on map.
return _vp_map_water_colour[slope_index]; return _vp_map_water_colour[slope_index];
} }
@@ -2000,7 +2000,7 @@ static inline uint32 ViewportMapGetColourOwner(const TileIndex tile, TileType t,
if (t == MP_WATER) { if (t == MP_WATER) {
if (is_32bpp) { if (is_32bpp) {
uint slope_index = 0; uint slope_index = 0;
if (IsTileType(t, MP_WATER) && GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index); if (IsTileType(tile, MP_WATER) && GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index);
return _vp_map_water_colour[slope_index]; return _vp_map_water_colour[slope_index];
} else { } else {
return PC_WATER; return PC_WATER;