From c2a69b3c5c79d4ba1968e1bcf6b1955b9e83abf1 Mon Sep 17 00:00:00 2001 From: Michael Bernardi Date: Fri, 30 Aug 2024 02:22:30 +1000 Subject: [PATCH 1/3] Fix #22606: Virtual floor at wrong height for paths --- src/openrct2/world/Footpath.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index dc7ffe7554..07c40db936 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -173,7 +173,7 @@ money64 FootpathProvisionalSet( VirtualFloorSetHeight(0); } else if ( - gFootpathConstructSlope == kTileSlopeFlat || gProvisionalFootpath.Position.z < gFootpathConstructFromPosition.z) + gProvisionalFootpath.Slope == kTileSlopeFlat || gProvisionalFootpath.Position.z < gFootpathConstructFromPosition.z) { // Going either straight on, or down. VirtualFloorSetHeight(gProvisionalFootpath.Position.z); From 1602a68cae4b3fac7dae31fe7938d8bd7331b8d2 Mon Sep 17 00:00:00 2001 From: Michael Bernardi Date: Fri, 30 Aug 2024 02:23:10 +1000 Subject: [PATCH 2/3] Remove unused headers in Footpath.cpp --- src/openrct2/world/Footpath.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 07c40db936..030e32a20d 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -22,18 +22,14 @@ #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" #include "../interface/Window_internal.h" -#include "../management/Finance.h" -#include "../network/network.h" #include "../object/FootpathObject.h" #include "../object/FootpathRailingsObject.h" #include "../object/FootpathSurfaceObject.h" #include "../object/ObjectEntryManager.h" -#include "../object/ObjectList.h" #include "../object/ObjectManager.h" #include "../object/PathAdditionEntry.h" #include "../paint/VirtualFloor.h" #include "../ride/RideData.h" -#include "../ride/Station.h" #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../util/Util.h" @@ -41,8 +37,6 @@ #include "Location.hpp" #include "Map.h" #include "MapAnimation.h" -#include "Park.h" -#include "Scenery.h" #include "Surface.h" #include "TileElement.h" From ea9787c155de74fffd6e955e53a3d690f516f4fe Mon Sep 17 00:00:00 2001 From: Michael Bernardi Date: Fri, 30 Aug 2024 04:05:00 +1000 Subject: [PATCH 3/3] Added changelog for #22606 --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 931c93d242..85d696bbe9 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -23,6 +23,7 @@ - Fix: [#22520] Virtual floor no longer appears when holding modifier keys during track construction. - Fix: [#22582] Lighting effects are not enabled/disabled correctly, making the game appear frozen. - Fix: [#22593] Memory leak on Android builds when reading zip files. +- Fix: [#22606] Virtual floor is sometimes drawn above the path when placing paths. - Fix: [#22625] Fix compilation with orignal ride ratings. 0.4.13 (2024-08-04)