mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Process @duncanspumpkin 's feedback on #10830 (#10853)

Browse Source
This commit is contained in:
Michael Steenbeek
2020-03-01 14:39:18 +01:00
committed by GitHub
parent e3f5eb7275
commit 5f0db41e48
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/paint/tile_element/Paint.Surface.cpp
View File

@@ -905,31 +905,29 @@ static void viewport_surface_draw_water_side_top(
static std::pair<int32_t, int32_t> surface_get_height_above_water(
const SurfaceElement& surfaceElement, const int32_t height, const int32_t surfaceShape)
{
int32_t local_surfaceShape = surfaceShape;
int32_t local_height = height;
int32_t localSurfaceShape = surfaceShape;
int32_t localHeight = height;
if (surfaceElement.GetWaterHeight() > 0)
{
int32_t waterHeight = surfaceElement.GetWaterHeight();
if (waterHeight > height)
{
local_height += (2 * COORDS_Z_STEP);
localHeight += (2 * COORDS_Z_STEP);
if (waterHeight != local_height || !(local_surfaceShape & TILE_ELEMENT_SURFACE_DIAGONAL_FLAG))
if (waterHeight != localHeight || !(localSurfaceShape & TILE_ELEMENT_SURFACE_DIAGONAL_FLAG))
{
local_height = waterHeight;
local_surfaceShape = 0;
localHeight = waterHeight;
localSurfaceShape = TILE_ELEMENT_SLOPE_FLAT;
}
else
{
int32_t bl = (surfaceShape ^ 0xF) << 2;
int32_t bh = bl >> 4;
local_surfaceShape = (bh & 0x3) | (bl & 0xC);
localSurfaceShape = ror4(surfaceShape ^ TILE_ELEMENT_SURFACE_RAISED_CORNERS_MASK, 2);
}
}
}
return { local_height, local_surfaceShape };
return { localHeight, localSurfaceShape };
}
/**