From 9971ca15adf57d72a0afd093ac6e32ca4fec43d3 Mon Sep 17 00:00:00 2001 From: frutiemax Date: Sat, 14 May 2022 14:19:00 -0400 Subject: [PATCH] Use ride->GetRideTypeDescriptor() in Maze related game actions --- src/openrct2/actions/MazePlaceTrackAction.cpp | 4 +++- src/openrct2/actions/MazeSetTrackAction.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp index ca926933e9..0f318a7a1c 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.cpp +++ b/src/openrct2/actions/MazePlaceTrackAction.cpp @@ -78,7 +78,9 @@ GameActions::Result MazePlaceTrackAction::Query() const { heightDifference /= COORDS_Z_PER_TINY_Z; - if (heightDifference > GetRideTypeDescriptor(RIDE_TYPE_MAZE).Heights.MaxHeight) + auto* ride = get_ride(_rideIndex); + const auto& rtd = ride->GetRideTypeDescriptor(); + if (heightDifference > rtd.Heights.MaxHeight) { res.Error = GameActions::Status::TooHigh; res.ErrorMessage = STR_TOO_HIGH_FOR_SUPPORTS; diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index 331f9f759c..88e0631757 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -89,7 +89,9 @@ GameActions::Result MazeSetTrackAction::Query() const { heightDifference /= COORDS_Z_PER_TINY_Z; - if (heightDifference > GetRideTypeDescriptor(RIDE_TYPE_MAZE).Heights.MaxHeight) + auto* ride = get_ride(_rideIndex); + const auto& rtd = ride->GetRideTypeDescriptor(); + if (heightDifference > rtd.Heights.MaxHeight) { res.Error = GameActions::Status::TooHigh; res.ErrorMessage = STR_TOO_HIGH_FOR_SUPPORTS;