Merge branch 'develop' into loadsave-toolbar

AaronVanGeffen · web-flow · commit 2ba66fc5e920 · 2025-02-22T19:04:27.000+01:00
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
@@ -5,6 +5,7 @@
 - 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: [#23874] The load/save file browser window now uses icons for its action buttons.
+- 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
@@ -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/park/Legacy.cpp b/src/openrct2/park/Legacy.cpp
@@ -2292,7 +2292,7 @@ const std::vector<std::string_view> peepAnimObjects = {
     "rct2.peep_animations.entertainer_snowman",
 };
 
-const std::vector<std::string_view>& GetLegacyPeepAnimationObjects(const ObjectList& entryList)
+const std::vector<std::string_view>& GetLegacyPeepAnimationObjects()
 {
     return peepAnimObjects;
 }
diff --git a/src/openrct2/park/Legacy.h b/src/openrct2/park/Legacy.h
@@ -40,7 +40,7 @@ void UpdateFootpathsFromMapping(
     ObjectList& requiredObjects, ObjectEntryIndex& surfaceCount, ObjectEntryIndex& railingCount, ObjectEntryIndex entryIndex,
     const OpenRCT2::RCT2::FootpathMapping* footpathMapping);
 
-const std::vector<std::string_view>& GetLegacyPeepAnimationObjects(const ObjectList& entryList);
+const std::vector<std::string_view>& GetLegacyPeepAnimationObjects();
 void ConvertPeepAnimationTypeToObjects(OpenRCT2::GameState_t& gameState);
 
 /**
diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp
@@ -385,7 +385,7 @@ namespace OpenRCT2
 
                 if (version < kPeepAnimationObjectsVersion)
                 {
-                    auto animObjects = GetLegacyPeepAnimationObjects(requiredObjects);
+                    auto animObjects = GetLegacyPeepAnimationObjects();
                     AppendRequiredObjects(requiredObjects, ObjectType::peepAnimations, animObjects);
                 }
 
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
@@ -1559,7 +1559,7 @@ namespace OpenRCT2::RCT1
                 AppendRequiredObjects(result, ObjectType::scenarioText, std::vector<std::string_view>({ desc.textObjectId }));
 
             // Add all legacy peep animation objects
-            auto animObjects = GetLegacyPeepAnimationObjects(result);
+            auto animObjects = GetLegacyPeepAnimationObjects();
             AppendRequiredObjects(result, ObjectType::peepAnimations, animObjects);
 
             return result;
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
@@ -1904,7 +1904,7 @@ namespace OpenRCT2::RCT2
                 AppendRequiredObjects(
                     objectList, ObjectType::scenarioText, std::vector<std::string_view>({ desc.textObjectId }));
 
-            auto animObjects = GetLegacyPeepAnimationObjects(objectList);
+            auto animObjects = GetLegacyPeepAnimationObjects();
             AppendRequiredObjects(objectList, ObjectType::peepAnimations, animObjects);
 
             return objectList;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -2292,7 +2292,7 @@ const std::vector<std::string_view> peepAnimObjects = {`
`2292`	`2292`	`"rct2.peep_animations.entertainer_snowman",`
`2293`	`2293`	`};`
`2294`	`2294`
`2295`		`-const std::vector<std::string_view>& GetLegacyPeepAnimationObjects(const ObjectList& entryList)`
	`2295`	`+const std::vector<std::string_view>& GetLegacyPeepAnimationObjects()`
`2296`	`2296`	`{`
`2297`	`2297`	`return peepAnimObjects;`
`2298`	`2298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ namespace OpenRCT2`
`385`	`385`
`386`	`386`	`if (version < kPeepAnimationObjectsVersion)`
`387`	`387`	`{`
`388`		`- auto animObjects = GetLegacyPeepAnimationObjects(requiredObjects);`
	`388`	`+ auto animObjects = GetLegacyPeepAnimationObjects();`
`389`	`389`	`AppendRequiredObjects(requiredObjects, ObjectType::peepAnimations, animObjects);`
`390`	`390`	`}`
`391`	`391`
Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,7 @@ bool RideModify(const CoordsXYE& input)`
`966`	`966`	`if (rideEntry == nullptr \|\| !ride_check_if_construction_allowed(*ride))`
`967`	`967`	`return false;`
`968`	`968`
`969`		`- if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE)`
	`969`	`+ if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE && !GetGameState().Cheats.makeAllDestructible)`
`970`	`970`	`{`
`971`	`971`	`Formatter ft;`
`972`	`972`	`ride->FormatNameTo(ft);`