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

Fix #8942: Water level is raised abnormally (#8971)

Browse Source
This commit is contained in:
Nazey
2019-03-26 12:34:30 -04:00
committed by Aaron van Geffen
parent c841ee31e7
commit 047fa65a66
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/actions/WaterRaiseAction.hpp
View File

@@ -86,6 +86,10 @@ private:
SurfaceElement* surfaceElement = tileElement->AsSurface(); SurfaceElement* surfaceElement = tileElement->AsSurface();
uint8_t height = surfaceElement->GetWaterHeight(); uint8_t height = surfaceElement->GetWaterHeight();
if (surfaceElement->base_height > maxHeight)
continue;
if (height != 0) if (height != 0)
{ {
height *= 2; height *= 2;

2
src/openrct2/network/Network.cpp
View File

@@ -31,7 +31,7 @@
// This string specifies which version of network stream current build uses. // This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within // It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version. // single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "9" #define NETWORK_STREAM_VERSION "10"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr; static Peep* _pickup_peep = nullptr;