Merge pull request #8820 from AaronVanGeffen/fix/8804

Fix #8804: Raising water shows money effect at the bottom

distribution/changelog.txt

@@ -77,6 +77,7 @@
 - Fix: [#8720] Desync due to boats colliding with ghost pieces.
 - Fix: [#8739] Savegame from original game crashes when cruising through map.
 - Fix: [#8742] Access violation in vehicle_update_sound_params.
+- Fix: [#8804] Raising water shows money effect at the bottom rather than new height.
 - Fix: [#8811] Some fields in the sv6 save file not being copied correctly.
 - Improved: [#2940] Allow mouse-dragging to set patrol area (Singleplayer only).
 - Improved: [#7730] Draw extreme vertical and lateral Gs red in the ride window's graph tab.

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 "52"
+#define NETWORK_STREAM_VERSION "53"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 static Peep* _pickup_peep = nullptr;

src/openrct2/world/Map.cpp

@@ -1429,7 +1429,7 @@ money32 raise_water(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint8_t flag
         int16_t water_height_z = z >> 16;
         int16_t base_height_z = z;
         z = water_height_z;
-        if (z != 0)
+        if (z == 0)
             z = base_height_z;
 
         LocationXYZ16 coord;