mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ken Reese 2023-09-18 01:18:51 -06:00 committed by GitHub
parent f2c6dcbbec
commit 79b5d814ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -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.

2
src/openrct2/actions/RideCreateAction.cpp
View File

@ -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;
}

2
src/openrct2/network/NetworkBase.cpp
View File

@ -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