1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00

Fix #21787: Map generator heightmap should respect increased height limits (#21798)

This commit is contained in:
Michał Janiszewski
2024-04-15 17:19:18 +02:00
committed by GitHub
parent 530a7de98f
commit b64ec76c95
2 changed files with 3 additions and 2 deletions

View File

@@ -4,6 +4,7 @@
- Improved: [#21769] Expose “animation is backwards” wall property in Tile Inspector. - Improved: [#21769] Expose “animation is backwards” wall property in Tile Inspector.
- Change: [#21715] [Plugin] Remove access to the internal `owner` property. Note: `ownership` is still accessible. - Change: [#21715] [Plugin] Remove access to the internal `owner` property. Note: `ownership` is still accessible.
- Fix: [#866] Boat Hire boats get stuck entering track. - Fix: [#866] Boat Hire boats get stuck entering track.
- Fix: [#21787] Map generator heightmap should respect increased height limits.
0.4.10 (2024-04-02) 0.4.10 (2024-04-02)
------------------------------------------------------------------------ ------------------------------------------------------------------------

View File

@@ -1089,7 +1089,7 @@ static uint64_t PressedWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {
InvalidateWidget(WIDX_HEIGHTMAP_STRENGTH); InvalidateWidget(WIDX_HEIGHTMAP_STRENGTH);
break; break;
case WIDX_HEIGHTMAP_LOW_UP: case WIDX_HEIGHTMAP_LOW_UP:
_heightmapLow = std::min(_heightmapLow + 1, 142 - 1); _heightmapLow = std::min(_heightmapLow + 1, kMaximumWaterHeight - 1);
_heightmapHigh = std::max(_heightmapHigh, _heightmapLow + 1); _heightmapHigh = std::max(_heightmapHigh, _heightmapLow + 1);
InvalidateWidget(WIDX_HEIGHTMAP_LOW); InvalidateWidget(WIDX_HEIGHTMAP_LOW);
break; break;
@@ -1098,7 +1098,7 @@ static uint64_t PressedWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {
InvalidateWidget(WIDX_HEIGHTMAP_LOW); InvalidateWidget(WIDX_HEIGHTMAP_LOW);
break; break;
case WIDX_HEIGHTMAP_HIGH_UP: case WIDX_HEIGHTMAP_HIGH_UP:
_heightmapHigh = std::min(_heightmapHigh + 1, 142); _heightmapHigh = std::min<int32_t>(_heightmapHigh + 1, kMaximumWaterHeight);
InvalidateWidget(WIDX_HEIGHTMAP_HIGH); InvalidateWidget(WIDX_HEIGHTMAP_HIGH);
break; break;
case WIDX_HEIGHTMAP_HIGH_DOWN: case WIDX_HEIGHTMAP_HIGH_DOWN: