Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-19 15:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx

Browse Source
This commit is contained in:
Jonathan G Rennison 2015-08-07 21:30:50 +01:00
commit 8386cc3c1b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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 (GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index); if (IsTileType(t, 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 && GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index); ///< Ignore industry on water not shown on map. 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.
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 (GetWaterTileType(tile) != WATER_TILE_COAST) GET_SLOPE_INDEX(slope_index); if (IsTileType(t, 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;
@ -2038,9 +2038,10 @@ static inline TileIndex ViewportMapGetMostSignificantTileType(const ViewPort * c
} else { } else {
ViewportMapStoreBridgeTunnel(vp, from_tile); ViewportMapStoreBridgeTunnel(vp, from_tile);
switch (GetTunnelBridgeTransportType(from_tile)) { switch (GetTunnelBridgeTransportType(from_tile)) {
case TRANSPORT_RAIL: *tile_type = MP_RAILWAY; break; case TRANSPORT_RAIL: *tile_type = MP_RAILWAY; break;
case TRANSPORT_ROAD: *tile_type = MP_ROAD; break; case TRANSPORT_ROAD: *tile_type = MP_ROAD; break;
default: *tile_type = MP_WATER; break; case TRANSPORT_WATER: *tile_type = MP_WATER; break;
default: NOT_REACHED(); break;
} }
} }
return from_tile; return from_tile;