mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Fix #10376: No ratings generated when a shop and track intersect (#10387)

Browse Source
This commit is contained in:
Ted John
2020-01-25 22:09:58 +00:00
committed by Michael Steenbeek
parent 2b6e925744
commit 519ea1c8c3
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -12,6 +12,7 @@
- Fix: [#10228] Can't import RCT1 Deluxe from Steam. - Fix: [#10228] Can't import RCT1 Deluxe from Steam.
- Fix: [#10313] Path furniture can be placed on level crossings. - Fix: [#10313] Path furniture can be placed on level crossings.
- Fix: [#10325] Crash when banners have no text. - Fix: [#10325] Crash when banners have no text.
- Fix: [#10376] No ratings generated when a shop and track intersect.
- Fix: [#10420] Money effect causing false positive desync. - Fix: [#10420] Money effect causing false positive desync.
- Fix: [#10477] Large Scenery cannot be placed higher using SHIFT. - Fix: [#10477] Large Scenery cannot be placed higher using SHIFT.
- Fix: [#10489] Hosts last player action not being synchronized. - Fix: [#10489] Hosts last player action not being synchronized.

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

@@ -31,7 +31,7 @@
// This string specifies which version of network stream current build uses. // This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within // It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version. // single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "11" #define NETWORK_STREAM_VERSION "12"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr; static Peep* _pickup_peep = nullptr;

12
src/openrct2/ride/RideRatings.cpp
View File

@@ -220,6 +220,12 @@ static void ride_ratings_update_state_2()
continue; continue;
if (tileElement->base_height != z) if (tileElement->base_height != z)
continue; continue;
if (tileElement->AsTrack()->GetRideIndex() != ride->id)
{
// Only check that the track belongs to the same ride if ride does not have buildable track
if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_TRACK))
continue;
}
if (trackType == 255 if (trackType == 255
|| (tileElement->AsTrack()->GetSequenceIndex() == 0 && trackType == tileElement->AsTrack()->GetTrackType())) || (tileElement->AsTrack()->GetSequenceIndex() == 0 && trackType == tileElement->AsTrack()->GetTrackType()))
@@ -331,6 +337,12 @@ static void ride_ratings_update_state_5()
continue; continue;
if (tileElement->base_height != z) if (tileElement->base_height != z)
continue; continue;
if (tileElement->AsTrack()->GetRideIndex() != ride->id)
{
// Only check that the track belongs to the same ride if ride does not have buildable track
if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_TRACK))
continue;
}
if (trackType == 255 || trackType == tileElement->AsTrack()->GetTrackType()) if (trackType == 255 || trackType == tileElement->AsTrack()->GetTrackType())
{ {