From 367fcaad3c9233dbfa11196d0a4eb478426a10fb Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Wed, 22 Dec 2021 00:18:42 +0200
Subject: [PATCH] Refactor MazeGetSegmentBit to use const CoordsXY&

---
 src/openrct2/actions/MazeSetTrackAction.cpp | 10 +++++-----
 src/openrct2/actions/MazeSetTrackAction.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp
index 15e6d444d6..146d10801f 100644
--- a/src/openrct2/actions/MazeSetTrackAction.cpp
+++ b/src/openrct2/actions/MazeSetTrackAction.cpp
@@ -207,7 +207,7 @@ GameActions::Result MazeSetTrackAction::Execute() const
     {
         case GC_SET_MAZE_TRACK_BUILD:
         {
-            uint8_t segmentOffset = MazeGetSegmentBit(_loc.x, _loc.y);
+            uint8_t segmentOffset = MazeGetSegmentBit(_loc);
 
             tileElement->AsTrack()->MazeEntrySubtract(1 << segmentOffset);
 
@@ -259,7 +259,7 @@ GameActions::Result MazeSetTrackAction::Execute() const
                     return res;
                 }
 
-                uint32_t segmentBit = MazeGetSegmentBit(previousSegment.x, previousSegment.y);
+                uint32_t segmentBit = MazeGetSegmentBit(previousSegment);
 
                 tileElement->AsTrack()->MazeEntryAdd(1 << segmentBit);
                 segmentBit--;
@@ -302,10 +302,10 @@ GameActions::Result MazeSetTrackAction::Execute() const
     return res;
 }
 
-uint8_t MazeSetTrackAction::MazeGetSegmentBit(uint16_t x, uint16_t y) const
+uint8_t MazeSetTrackAction::MazeGetSegmentBit(const CoordsXY& coords) const
 {
-    uint8_t minorX = x & 0x1F; // 0 or 16
-    uint8_t minorY = y & 0x1F; // 0 or 16
+    uint8_t minorX = coords.x & 0x1F;
+    uint8_t minorY = coords.y & 0x1F;
 
     if (minorX == 0 && minorY == 0)
     {
diff --git a/src/openrct2/actions/MazeSetTrackAction.h b/src/openrct2/actions/MazeSetTrackAction.h
index 912191f2bc..271831a6a7 100644
--- a/src/openrct2/actions/MazeSetTrackAction.h
+++ b/src/openrct2/actions/MazeSetTrackAction.h
@@ -55,5 +55,5 @@ public:
     GameActions::Result Execute() const override;
 
 private:
-    uint8_t MazeGetSegmentBit(uint16_t x, uint16_t y) const;
+    uint8_t MazeGetSegmentBit(const CoordsXY&) const;
 };