From 39722307d21eff99180ccc67d1a75bdd8744fe9c Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 9 Aug 2022 20:06:21 +0200 Subject: [PATCH] Fix #11746: Cannot set ride or shop prices in some circumstances (#17765) --- src/openrct2/actions/RideSetPriceAction.cpp | 2 +- src/openrct2/network/NetworkBase.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp index ab6cbbb4c7..ae66fa0f23 100644 --- a/src/openrct2/actions/RideSetPriceAction.cpp +++ b/src/openrct2/actions/RideSetPriceAction.cpp @@ -99,7 +99,7 @@ GameActions::Result RideSetPriceAction::Execute() const shopItem = ShopItem::Admission; const auto& rtd = ride->GetRideTypeDescriptor(); - if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_TOILET)) + if (!rtd.HasFlag(RIDE_TYPE_FLAG_IS_TOILET)) { shopItem = rideEntry->shop_item[0]; if (shopItem == ShopItem::None) diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index b14fdeabdf..9b65a662dd 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -42,7 +42,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "3" +#define NETWORK_STREAM_VERSION "4" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;