From 2f32a094eef096d4ad21784d22a37b10ba83a51f Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Wed, 8 Jul 2020 13:41:40 -0300 Subject: [PATCH] Use CoordsXYZ for RideRatingCalculationData::proximity_start --- src/openrct2/rct2/S6Exporter.cpp | 6 +++--- src/openrct2/rct2/S6Importer.cpp | 4 +--- src/openrct2/ride/RideRatings.cpp | 10 +++------- src/openrct2/ride/RideRatings.h | 4 +--- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index eb1c078729..f9eb4c1424 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -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; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index df9337a28a..a9be8d0591 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -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; diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index d3f7215a75..8ffa2e7508 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -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; } } diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index aa938665a5..5629ad57da 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -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;