From 94e8e9ea6b4e8cbaaab9ce4330d01404e7bf30d5 Mon Sep 17 00:00:00 2001 From: Rik Smeets <30838294+rik-smeets@users.noreply.github.com> Date: Thu, 13 Oct 2022 18:54:19 +0200 Subject: [PATCH] Fix #18094: Invisible underground shops/facilities Underground shops and facilities placed right next to non-underground path would be connected to the path, but the buildings themselves would remain invisible. Guests could use them though. This has been fixed by drawing a tunnel, which is the same way ride entrances/exits are drawn. --- distribution/changelog.txt | 1 + src/openrct2/ride/shops/Facility.cpp | 2 ++ src/openrct2/ride/shops/Shop.cpp | 2 ++ 3 files changed, 5 insertions(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 28496a6a98..73c9e27d55 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -5,6 +5,7 @@ - Fix: [#17853] Invention name tears while being dragged. - Fix: [#18064] Unable to dismiss notification messages. - Fix: [#18070] Underground entrance/exit shows through terrain walls (original bug). +- Fix: [#18094] Underground shops & facilities don't show when adjacent to non-underground path (original bug). - Fix: [#18122] Ghosts count towards “Great scenery!” guest thought. - Fix: [#18134] Underground on-ride photo section partially clips through adjacent terrain edge. - Fix: [#18257] Guests ‘waiting’ on extended railway crossings. diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp index 3b42410e5d..34bbc3e5ff 100644 --- a/src/openrct2/ride/shops/Facility.cpp +++ b/src/openrct2/ride/shops/Facility.cpp @@ -65,6 +65,8 @@ static void PaintFacility( PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); + + PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT); } /* 0x00762D44 */ diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp index 561f1a6b7f..e3c588adc7 100644 --- a/src/openrct2/ride/shops/Shop.cpp +++ b/src/openrct2/ride/shops/Shop.cpp @@ -52,6 +52,8 @@ static void PaintShop( PaintUtilSetSegmentSupportHeight(session, SEGMENTS_ALL, 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); + + PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_SQUARE_FLAT); } TRACK_PAINT_FUNCTION get_track_paint_function_shop(int32_t trackType)