mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor #9676: Use std::clamp in place of std::min/std::max pair

This commit is contained in:
Justin Gottula 2019-07-31 14:50:17 -07:00
parent ae87f5037a
commit 594a220da2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1230,8 +1230,7 @@ static rating_tuple get_special_track_elements_rating(uint8_t type, Ride* ride)
al = std::min<int32_t>(helix_sections, 11);
intensity += (al * 148945) >> 16;
al = std::max<int32_t>(helix_sections - 5, 0);
al = std::min(al, 10);
al = std::clamp<int32_t>(helix_sections - 5, 0, 10);
nausea += (al * 0x140000) >> 16;
rating_tuple rating = { (ride_rating)excitement, (ride_rating)intensity, (ride_rating)nausea };