From c492362e454170d2c3e494b1efc2cc5e58e51a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 30 Sep 2021 15:34:22 +0300
Subject: [PATCH] Fix mistake and cleanup

---
 src/openrct2/peep/Guest.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp
index 3a09bc14cd..12e87098b9 100644
--- a/src/openrct2/peep/Guest.cpp
+++ b/src/openrct2/peep/Guest.cpp
@@ -5028,12 +5028,12 @@ void Guest::UpdateRideShopLeave()
     if (auto loc = UpdateAction(); loc.has_value())
     {
         const auto curLoc = GetLocation();
-
         MoveTo({ loc.value(), curLoc.z });
 
-        if ((curLoc.x & 0xFFE0) != NextLoc.x)
+        const auto newLoc = GetLocation().ToTileStart();
+        if (newLoc.x != NextLoc.x)
             return;
-        if ((curLoc.y & 0xFFE0) != NextLoc.y)
+        if (newLoc.y != NextLoc.y)
             return;
     }