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

Drop bitmask from TrackShelteredEighths comparisons

This commit is contained in:
Gymnasiast 2019-03-27 19:44:33 +01:00
parent bc0b0fe231
commit a3a1028385
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1895,7 +1895,7 @@ static void ride_ratings_calculate_miniature_railway(Ride* ride)
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
auto shelteredEighths = get_num_of_sheltered_eighths(ride);
if ((shelteredEighths.TrackShelteredEighths & 0xFF) >= 4)
if (shelteredEighths.TrackShelteredEighths >= 4)
ride->excitement /= 4;
ride->sheltered_eighths = shelteredEighths.TotalShelteredEighths;
@ -1930,7 +1930,7 @@ static void ride_ratings_calculate_monorail(Ride* ride)
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
auto shelteredEighths = get_num_of_sheltered_eighths(ride);
if ((shelteredEighths.TrackShelteredEighths & 0xFF) >= 4)
if (shelteredEighths.TrackShelteredEighths >= 4)
ride->excitement /= 4;
ride->sheltered_eighths = shelteredEighths.TotalShelteredEighths;
@ -2237,7 +2237,7 @@ static void ride_ratings_calculate_observation_tower(Ride* ride)
ride->sheltered_eighths = 7;
auto shelteredEighths = get_num_of_sheltered_eighths(ride);
if ((shelteredEighths.TrackShelteredEighths & 0xFF) >= 5)
if (shelteredEighths.TrackShelteredEighths >= 5)
ride->excitement /= 4;
}
@ -2401,7 +2401,7 @@ static void ride_ratings_calculate_chairlift(Ride* ride)
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
auto shelteredEighths = get_num_of_sheltered_eighths(ride);
if ((shelteredEighths.TrackShelteredEighths & 0xFF) >= 4)
if (shelteredEighths.TrackShelteredEighths >= 4)
ride->excitement /= 4;
ride->sheltered_eighths = shelteredEighths.TotalShelteredEighths;
@ -2545,7 +2545,7 @@ static void ride_ratings_calculate_go_karts(Ride* ride)
auto shelteredEighths = get_num_of_sheltered_eighths(ride);
ride->sheltered_eighths = shelteredEighths.TotalShelteredEighths;
if ((shelteredEighths.TrackShelteredEighths & 0xFF) >= 6)
if (shelteredEighths.TrackShelteredEighths >= 6)
ride->excitement /= 2;
}
@ -3290,7 +3290,7 @@ static void ride_ratings_calculate_suspended_monorail(Ride* ride)
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
auto shelteredEighths = get_num_of_sheltered_eighths(ride);
if ((shelteredEighths.TrackShelteredEighths & 0xFF) >= 4)
if (shelteredEighths.TrackShelteredEighths >= 4)
ride->excitement /= 4;
ride->sheltered_eighths = shelteredEighths.TotalShelteredEighths;