From 79b5d814ce2eb4ada1e984c0a83aeb3a1fea8342 Mon Sep 17 00:00:00 2001 From: Ken Reese Date: Mon, 18 Sep 2023 01:18:51 -0600 Subject: [PATCH] Set default ride price to free if park entrance fee has been set (#20790) * Set default ride price to 0 if park entrance fee is > 0 * Update changelog and network version * Update distribution/changelog.txt Co-authored-by: Matt <5415177+ZehMatt@users.noreply.github.com> --------- Co-authored-by: Matt <5415177+ZehMatt@users.noreply.github.com> --- distribution/changelog.txt | 1 + src/openrct2/actions/RideCreateAction.cpp | 2 +- src/openrct2/network/NetworkBase.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 3e8a44ad49..73a43fb063 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,5 +1,6 @@ 0.4.7 (in development) ------------------------------------------------------------------------ +- Change: [#20790] Default ride price set to free if park charges for entry. - Fix: [#20737] Spent money in player window underflows when getting refunds. - Fix: [#20778] [Plugin] Incorrect target api when executing custom actions. diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index b3ec046f05..79253bd771 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -216,7 +216,7 @@ GameActions::Result RideCreateAction::Execute() const if (rideEntry->shop_item[0] == ShopItem::None) { - if (!ParkRidePricesUnlocked()) + if (!ParkRidePricesUnlocked() || gParkEntranceFee > 0) { ride->price[0] = 0; } diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index e205bdb61a..884222c409 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -43,7 +43,7 @@ // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "0" +#define NETWORK_STREAM_VERSION "1" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION