From a69390cde42d4f726496c853ffffb7d9cf19abbf Mon Sep 17 00:00:00 2001 From: mix <167040362+mixiate@users.noreply.github.com> Date: Sat, 22 Feb 2025 16:55:14 +0000 Subject: [PATCH] =?UTF-8?q?Allow=20editing=20of=20indestructible=20rides?= =?UTF-8?q?=20when=20the=20=E2=80=98make=20all=20destructible=E2=80=99=20c?= =?UTF-8?q?heat=20is=20enabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- distribution/changelog.txt | 1 + src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/ride/RideConstruction.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 2b4cbd1a01..94d1b41b47 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -4,6 +4,7 @@ - Feature: [#23759] Add see-through option to the “Cut-away View“. - Improved: [#23677] Building new ride track now inherits the colour scheme from the previous piece. - Improved: [#23720] Text fields now allow cutting to clipboard (Ctrl+X) in addition to copy and paste. +- Improved: [#23875] Rides forbidden to be modified or destroyed can now be edited with the All destructible cheat. - Fix: [#1972, #11679] Vehicles passing by toilets can cause them to glitch (original bug). - Fix: [#9999, #10000, #10001, #10002, #10003] Truncated scenario strings when using Catalan, Czech, Japanese, Polish or Russian. - Fix: [#14486] Guests will fall through upwards sloped paths when making their way through a park entrance or ride exit (original bug). diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 29f6035a3a..8865435bd2 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -49,7 +49,7 @@ using namespace OpenRCT2; // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -constexpr uint8_t kNetworkStreamVersion = 2; +constexpr uint8_t kNetworkStreamVersion = 3; const std::string kNetworkStreamID = std::string(kOpenRCT2Version) + "-" + std::to_string(kNetworkStreamVersion); diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index 8423c8df05..8179c1c05e 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -966,7 +966,7 @@ bool RideModify(const CoordsXYE& input) if (rideEntry == nullptr || !ride_check_if_construction_allowed(*ride)) return false; - if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE) + if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE && !GetGameState().Cheats.makeAllDestructible) { Formatter ft; ride->FormatNameTo(ft);