From 1a39677f8335b7c6315518785a12079d96e6e0b9 Mon Sep 17 00:00:00 2001 From: MarcelVos96 Date: Mon, 10 Nov 2025 19:37:20 +0100 Subject: [PATCH 1/6] Update contributors.md --- contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.md b/contributors.md index 8a6fb4a33e..395c051e5e 100644 --- a/contributors.md +++ b/contributors.md @@ -254,6 +254,7 @@ Appreciation for contributors who have provided substantial work, but are no lon * David Sungaila (sungaila) * Garrett Leach (GarrettLeach) * Ruohao (Jater) Xu (jaterx) +* Marcel Vos (MarcelVos96) ## Toolchain * (Balletie) - macOS From e3aa52bc1a12eec3b1dd3230153d2e202cefb047 Mon Sep 17 00:00:00 2001 From: MarcelVos96 Date: Mon, 1 Dec 2025 12:03:30 +0100 Subject: [PATCH 2/6] Fix #25592: Some water rides have wrong breakdowns The log flume, river rapids, and splash boats had the control failure breakdown available instead of the correct brakes failure. --- src/openrct2/ride/rtd/water/LogFlume.h | 2 +- src/openrct2/ride/rtd/water/RiverRapids.h | 2 +- src/openrct2/ride/rtd/water/SplashBoats.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/ride/rtd/water/LogFlume.h b/src/openrct2/ride/rtd/water/LogFlume.h index 5ee6e039aa..6111c9a004 100644 --- a/src/openrct2/ride/rtd/water/LogFlume.h +++ b/src/openrct2/ride/rtd/water/LogFlume.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor LogFlumeRTD = .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_LOG_FLUME, STR_RIDE_DESCRIPTION_LOG_FLUME }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), + .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 10, 24, 7, 9, }, .MaxMass = 255, .LiftData = { Audio::SoundId::liftFlume, 5, 5 }, diff --git a/src/openrct2/ride/rtd/water/RiverRapids.h b/src/openrct2/ride/rtd/water/RiverRapids.h index 85eca6af24..d425bc4f29 100644 --- a/src/openrct2/ride/rtd/water/RiverRapids.h +++ b/src/openrct2/ride/rtd/water/RiverRapids.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor RiverRapidsRTD = .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), + .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 9, 32, 14, 15, }, .MaxMass = 255, .LiftData = { Audio::SoundId::liftFlume, 5, 5 }, diff --git a/src/openrct2/ride/rtd/water/SplashBoats.h b/src/openrct2/ride/rtd/water/SplashBoats.h index f85b348cb1..964c493d76 100644 --- a/src/openrct2/ride/rtd/water/SplashBoats.h +++ b/src/openrct2/ride/rtd/water/SplashBoats.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor SplashBoatsRTD = .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_SPLASH_BOATS, STR_RIDE_DESCRIPTION_SPLASH_BOATS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, - .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), + .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 7, 11, }, .MaxMass = 255, .LiftData = { Audio::SoundId::liftFlume, 5, 5 }, From 688c60654b1e8d5db13d324aacffeccb2592c97c Mon Sep 17 00:00:00 2001 From: MarcelVos96 Date: Mon, 1 Dec 2025 19:49:17 +0100 Subject: [PATCH 3/6] Update network version --- src/openrct2/network/NetworkBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 9e3f27a495..4b4b963c2d 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -47,7 +47,7 @@ // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -constexpr uint8_t kStreamVersion = 0; +constexpr uint8_t kStreamVersion = 1; const std::string kStreamID = std::string(kOpenRCT2Version) + "-" + std::to_string(kStreamVersion); From bfd26ec97f25c3642c5714748a19169a11eaa80c Mon Sep 17 00:00:00 2001 From: MarcelVos96 Date: Mon, 1 Dec 2025 19:53:09 +0100 Subject: [PATCH 4/6] Update changelog.txt --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 5707772e0a..ef38398b89 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -10,6 +10,7 @@ - Fix: [#25565] Chairlift station ends are missing tunnels at certain rotations. - Fix: [#25569] Placing park entrances in multiplayer does not show for other players, causing desyncs. - Fix: [#25571] Potential crash due to drawing a Crooked House ride. +- Fix: [#25592] Log flume, river rapids, & splash boats can get control failure breakdown instead of brakes failure 0.4.29 (2025-11-22) ------------------------------------------------------------------------ From ad16d0567b09c4568929c276524048e139ffac95 Mon Sep 17 00:00:00 2001 From: MarcelVos96 Date: Mon, 1 Dec 2025 20:16:03 +0100 Subject: [PATCH 5/6] Update changelog.txt --- distribution/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 122624c5ef..1e42114599 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -10,7 +10,7 @@ - Fix: [#25565] Chairlift station ends are missing tunnels at certain rotations. - Fix: [#25569] Placing park entrances in multiplayer does not show for other players, causing desyncs. - Fix: [#25571] Potential crash due to drawing a Crooked House ride. -- Fix: [#25592] Log flume, river rapids, & splash boats can get control failure breakdown instead of brakes failure +- Fix: [#25592] Log flume, river rapids, & splash boats can get control failure breakdown instead of brakes failure. - Fix: [#25588] When the master server becomes unreachable the server would not register again until a restart. 0.4.29 (2025-11-22) From f86728f4a243fb755cb04c79871a87442625ac80 Mon Sep 17 00:00:00 2001 From: MarcelVos96 Date: Mon, 1 Dec 2025 20:23:23 +0100 Subject: [PATCH 6/6] Update changelog.txt --- distribution/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 1e42114599..a3c5e18f5b 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -10,8 +10,8 @@ - Fix: [#25565] Chairlift station ends are missing tunnels at certain rotations. - Fix: [#25569] Placing park entrances in multiplayer does not show for other players, causing desyncs. - Fix: [#25571] Potential crash due to drawing a Crooked House ride. -- Fix: [#25592] Log flume, river rapids, & splash boats can get control failure breakdown instead of brakes failure. - Fix: [#25588] When the master server becomes unreachable the server would not register again until a restart. +- Fix: [#25592] Log flume, river rapids, & splash boats can get control failure breakdown instead of brakes failure. 0.4.29 (2025-11-22) ------------------------------------------------------------------------