mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity

Apply Duncan's request

Browse Source
This commit is contained in:
Gymnasiast
2021-02-18 17:53:30 +01:00
parent 81fbe27dcb
commit 8968dd2274
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/rct2/S6Importer.cpp
View File

@@ -803,13 +803,10 @@ public:
dst.ProximityStart = { src.proximity_start_x, src.proximity_start_y, src.proximity_start_z };
dst.CurrentRide = src.current_ride;
dst.State = src.state;
if (src.proximity_track_type == 0xFF)
dst.ProximityTrackType = TrackElemType::None;
else if (
src.current_ride < RCT12_MAX_RIDES_IN_PARK && _s6.rides[src.current_ride].type < std::size(RideTypeDescriptors))
if (src.current_ride < RCT12_MAX_RIDES_IN_PARK && _s6.rides[src.current_ride].type < std::size(RideTypeDescriptors))
dst.ProximityTrackType = RCT2TrackTypeToOpenRCT2(src.proximity_track_type, _s6.rides[src.current_ride].type);
else
dst.ProximityTrackType = src.proximity_track_type;
dst.ProximityTrackType = 0xFF;
dst.ProximityBaseHeight = src.proximity_base_height;
dst.ProximityTotal = src.proximity_total;
for (size_t i = 0; i < std::size(src.proximity_scores); i++)

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

@@ -226,7 +226,8 @@ static void ride_ratings_update_state_2()
continue;
}
if (trackType == TrackElemType::None
// TODO: Hack to be removed with new save format - trackType 0xFF should not be here.
if (trackType == 0xFF || trackType == TrackElemType::None
|| (tileElement->AsTrack()->GetSequenceIndex() == 0 && trackType == tileElement->AsTrack()->GetTrackType()))
{
if (trackType == TrackElemType::EndStation)
@@ -332,7 +333,8 @@ static void ride_ratings_update_state_5()
continue;
}
if (trackType == TrackElemType::None || trackType == tileElement->AsTrack()->GetTrackType())
// TODO: Hack to be removed with new save format - trackType 0xFF should not be here.
if (trackType == 0xFF || trackType == TrackElemType::None || trackType == tileElement->AsTrack()->GetTrackType())
{
ride_ratings_score_close_proximity(tileElement);