From 159646e717b11967ffcf9653ac19fbc20c2a6d0e Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Sun, 24 Apr 2016 11:40:25 +0200
Subject: [PATCH] Fix water edges

---
 src/interface/viewport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/interface/viewport.c b/src/interface/viewport.c
index 2b67a7f5cb..8802f3e31b 100644
--- a/src/interface/viewport.c
+++ b/src/interface/viewport.c
@@ -2290,14 +2290,14 @@ void viewport_surface_paint_setup(uint8 direction, uint16 height, rct_map_elemen
 		RCT2_GLOBAL(RCT2_ADDRESS_PAINT_SETUP_CURRENT_TYPE, uint8) = VIEWPORT_INTERACTION_ITEM_WATER;
 
 		uint16 ax = height + 16;
-		uint16 dx = (mapElement->properties.surface.terrain & 0x1F) << 4;
+		uint16 dx = (mapElement->properties.surface.terrain & 0x1F) * 16;
 
 		RCT2_GLOBAL(0x009E3298, uint16) = dx;
 		if ((RCT2_GLOBAL(0x9DEA6F, uint8_t) & 1) == 0) {
 			RCT2_GLOBAL(0x0141E9DC, uint16) = dx;
 
 			int image_offset = 0;
-			if (dx > ax) {
+			if (dx <= ax) {
 				image_offset = byte_97B740[ebx & 0xF];
 			}