From 373776f3db02a53a88ba837d02b649a60be56740 Mon Sep 17 00:00:00 2001
From: Tulio Leao <tupaschoal@gmail.com>
Date: Sat, 9 May 2020 07:35:36 -0300
Subject: [PATCH] Address review comments on #11598

---
 src/openrct2-ui/windows/RideConstruction.cpp | 1 +
 src/openrct2/windows/_legacy.cpp             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index a26c81cbd4..c4bef2e452 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -3546,6 +3546,7 @@ void ride_construction_toolupdate_construct(const ScreenCoordsXY& screenCoords)
                 &trackType, &trackDirection, &rideIndex, &liftHillAndAlternativeState, &trackPos, nullptr);
             _currentTrackPrice = place_provisional_track_piece(
                 rideIndex, trackType, trackDirection, liftHillAndAlternativeState, trackPos);
+            z = trackPos.z;
             if (_currentTrackPrice != MONEY32_UNDEFINED)
                 break;
 
diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp
index b4a4ffed32..00c1d9447e 100644
--- a/src/openrct2/windows/_legacy.cpp
+++ b/src/openrct2/windows/_legacy.cpp
@@ -431,7 +431,7 @@ void window_ride_construction_mouseup_demolish_next_piece(const CoordsXYZD& piec
 {
     if (gGotoStartPlacementMode)
     {
-        _currentTrackBegin.z = piecePos.z & 0xFFF0;
+        _currentTrackBegin.z = floor2(piecePos.z, COORDS_Z_STEP);
         _rideConstructionState = RIDE_CONSTRUCTION_STATE_FRONT;
         _currentTrackSelectionFlags = 0;
         _rideConstructionArrowPulseTime = 0;