From 594a220da22371bde1e103fb23afa87626d97389 Mon Sep 17 00:00:00 2001 From: Justin Gottula Date: Wed, 31 Jul 2019 14:50:17 -0700 Subject: [PATCH] Refactor #9676: Use std::clamp in place of std::min/std::max pair --- src/openrct2/ride/RideRatings.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index d48e7ddfa1..4bc13a0980 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -1230,8 +1230,7 @@ static rating_tuple get_special_track_elements_rating(uint8_t type, Ride* ride) al = std::min(helix_sections, 11); intensity += (al * 148945) >> 16; - al = std::max(helix_sections - 5, 0); - al = std::min(al, 10); + al = std::clamp(helix_sections - 5, 0, 10); nausea += (al * 0x140000) >> 16; rating_tuple rating = { (ride_rating)excitement, (ride_rating)intensity, (ride_rating)nausea };