Merge pull request #25593 from MarcelVos96/Water-rides-breakdown-fix

Fix #25592: Some water rides have wrong breakdowns

distribution/changelog.txt

@@ -11,6 +11,7 @@
 - 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: [#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)
 ------------------------------------------------------------------------

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);
 

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 },

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 },

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 },