mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 19:25:12 +01:00
Code Issues Releases Wiki Activity

Fix #7094: Back wall edge texture in water missing

Browse Source
This commit is contained in:
Gymnasiast
2020-03-26 12:01:25 +01:00
parent 6c0de27d54
commit aeb1b32078
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -2,6 +2,7 @@
------------------------------------------------------------------------
- Feature: [#11013] Ctrl+C copies input dialog text to clipboard.
- Fix: [#6123, #7907, #9472, #11028] Cannot build some track designs with 4 stations (original bug).
- Fix: [#7094] Back wall edge texture in water missing.
- Fix: [#11027] Third color on walls becomes black when saving.
0.2.5 (2020-03-24)

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

@@ -756,7 +756,7 @@ static void viewport_surface_draw_tile_side_top(
if (!is_csg_loaded() && terrain >= TERRAIN_EDGE_RCT2_COUNT)
terrain = TERRAIN_EDGE_ROCK;
int16_t cornerHeight1, neighbourCornerHeight1, cornerHeight2, neighbourCornerHeight2, landHeight = 0;
int16_t cornerHeight1, neighbourCornerHeight1, cornerHeight2, neighbourCornerHeight2;
CoordsXY offset = { 0, 0 };
CoordsXY bounds = { 0, 0 };
@@ -789,9 +789,6 @@ static void viewport_surface_draw_tile_side_top(
return;
}
if (!isWater)
landHeight = height;
// save ecx
if (neighbour.tile_element == nullptr)
{
@@ -802,14 +799,14 @@ static void viewport_surface_draw_tile_side_top(
{
if (isWater)
{
auto waterHeight = neighbour.tile_element->AsSurface()->GetWaterHeight() / COORDS_Z_STEP;
if (landHeight == waterHeight)
auto waterHeight = neighbour.tile_element->AsSurface()->GetWaterHeight() / (COORDS_Z_STEP * 2);
if (height == waterHeight)
{
return;
}
cornerHeight1 = landHeight;
cornerHeight2 = landHeight;
cornerHeight1 = height;
cornerHeight2 = height;
}
}
@@ -835,7 +832,7 @@ static void viewport_surface_draw_tile_side_top(
{
const uint8_t incline = (cornerHeight2 - cornerHeight1) + 1;
const uint32_t image_id = get_edge_image(terrain, 3) + (edge == EDGE_TOPLEFT ? 3 : 0) + incline; // var_c;
const int16_t y = (landHeight - cornerHeight1) * COORDS_Z_PER_TINY_Z;
const int16_t y = (height - cornerHeight1) * COORDS_Z_PER_TINY_Z;
paint_attach_to_previous_ps(session, image_id, 0, y);
return;
}