From 047fa65a6608600487e162d46b3f6563431ca22c Mon Sep 17 00:00:00 2001 From: Nazey Date: Tue, 26 Mar 2019 12:34:30 -0400 Subject: [PATCH] Fix #8942: Water level is raised abnormally (#8971) --- src/openrct2/actions/WaterRaiseAction.hpp | 4 ++++ src/openrct2/network/Network.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/openrct2/actions/WaterRaiseAction.hpp b/src/openrct2/actions/WaterRaiseAction.hpp index d95fefd359..7ee71f7796 100644 --- a/src/openrct2/actions/WaterRaiseAction.hpp +++ b/src/openrct2/actions/WaterRaiseAction.hpp @@ -86,6 +86,10 @@ private: SurfaceElement* surfaceElement = tileElement->AsSurface(); uint8_t height = surfaceElement->GetWaterHeight(); + + if (surfaceElement->base_height > maxHeight) + continue; + if (height != 0) { height *= 2; diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 1d6be0643e..ade9764b8b 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -31,7 +31,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "9" +#define NETWORK_STREAM_VERSION "10" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;