From f8d71fcc2faf23e2cdc5ab0dff93db57bafb9160 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 16 Nov 2023 03:36:14 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20#20253,=20#20799,=20#20841,=20#20903,=20#?= =?UTF-8?q?20915:=20Crash=20when=20displaying=20a=20Lay-Down=20RC=E2=80=99?= =?UTF-8?q?s=20half=20loop=20(#20968)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix #20253: Crash when displaying a Lay-Down RC’s half loop * Bump network version --- distribution/changelog.txt | 1 + src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index b39a8ea993..de32611734 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -10,6 +10,7 @@ - Fix: [#16453] Tile inspector invisibility shortcut does not use a game action. - Fix: [#18199] Dots in the game save's name no longer get truncated. - Fix: [#19722] “Forbid tree removal” restriction doesn't forbid removal of large scenery tree items. +- Fix: [#20253] Crash when displaying a Lay-Down RC’s half loop. - Fix: [#20356] Cannot set tertiary colour on small scenery. - Fix: [#20679] Android: game crashes at launch. - Fix: [#20737] Spent money in player window underflows when getting refunds. diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 46cbcc42ab..679b7f8e6a 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -43,7 +43,7 @@ // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "8" +#define NETWORK_STREAM_VERSION "9" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 2e0c6a4fe7..435108711b 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -10421,7 +10421,7 @@ static void LayDownRCTrackHalfLoopUninvertedDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - auto function = GetTrackPaintFunctionCorkscrewRC(TrackElemType::FlyerHalfLoopInvertedUp); + auto function = GetTrackPaintFunctionLayDownRC(TrackElemType::FlyerHalfLoopInvertedUp); function(session, ride, 3 - trackSequence, direction, height, trackElement); return; }