mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 09:14:58 +01:00
Code Issues Releases Wiki Activity

Use CoordsXYZ for RideRatingCalculationData::proximity_start

Browse Source
This commit is contained in:
Tulio Leao
2020-07-08 13:41:40 -03:00
parent d662de202f
commit 2f32a094ee
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/rct2/S6Exporter.cpp
View File

@@ -775,9 +775,9 @@ void S6Exporter::ExportRideRatingsCalcData()
dst.proximity_x = src.proximity.x;
dst.proximity_y = src.proximity.y;
dst.proximity_z = src.proximity.z;
dst.proximity_start_x = src.proximity_start_x;
dst.proximity_start_y = src.proximity_start_y;
dst.proximity_start_z = src.proximity_start_z;
dst.proximity_start_x = src.proximity_start.x;
dst.proximity_start_y = src.proximity_start.y;
dst.proximity_start_z = src.proximity_start.z;
dst.current_ride = src.current_ride;
dst.state = src.state;
dst.proximity_track_type = src.proximity_track_type;

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

@@ -797,9 +797,7 @@ public:
auto& dst = gRideRatingsCalcData;
dst = {};
dst.proximity = { src.proximity_x, src.proximity_y, src.proximity_z };
dst.proximity_start_x = src.proximity_start_x;
dst.proximity_start_y = src.proximity_start_y;
dst.proximity_start_z = src.proximity_start_z;
dst.proximity_start = { src.proximity_start_x, src.proximity_start_y, src.proximity_start_z };
dst.current_ride = src.current_ride;
dst.state = src.state;
dst.proximity_track_type = src.proximity_track_type;

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

@@ -251,8 +251,7 @@ static void ride_ratings_update_state_2()
loc = { nextTrackElement, nextTrackElement.element->GetBaseZ() };
tileElement = nextTrackElement.element;
if (loc.x == gRideRatingsCalcData.proximity_start_x && loc.y == gRideRatingsCalcData.proximity_start_y
&& loc.z == gRideRatingsCalcData.proximity_start_z)
if (loc == gRideRatingsCalcData.proximity_start)
{
gRideRatingsCalcData.state = RIDE_RATINGS_STATE_CALCULATE;
return;
@@ -347,8 +346,7 @@ static void ride_ratings_update_state_5()
loc.x = trackBeginEnd.begin_x;
loc.y = trackBeginEnd.begin_y;
loc.z = trackBeginEnd.begin_z;
if (loc.x == gRideRatingsCalcData.proximity_start_x && loc.y == gRideRatingsCalcData.proximity_start_y
&& loc.z == gRideRatingsCalcData.proximity_start_z)
if (loc == gRideRatingsCalcData.proximity_start)
{
gRideRatingsCalcData.state = RIDE_RATINGS_STATE_CALCULATE;
return;
@@ -395,9 +393,7 @@ static void ride_ratings_begin_proximity_loop()
gRideRatingsCalcData.proximity = location;
gRideRatingsCalcData.proximity_track_type = 255;
gRideRatingsCalcData.proximity_start_x = location.x;
gRideRatingsCalcData.proximity_start_y = location.y;
gRideRatingsCalcData.proximity_start_z = location.z;
gRideRatingsCalcData.proximity_start = location;
return;
}
}

4
src/openrct2/ride/RideRatings.h
View File

@@ -41,9 +41,7 @@ enum
struct RideRatingCalculationData
{
CoordsXYZ proximity;
uint16_t proximity_start_x;
uint16_t proximity_start_y;
uint16_t proximity_start_z;
CoordsXYZ proximity_start;
ride_id_t current_ride;
uint8_t state;
uint8_t proximity_track_type;