mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity

Rename 65DDD1 to turns_ratings

Browse Source
This commit is contained in:
Michał Janiszewski
2016-10-30 22:09:59 +01:00
parent ccc3297424
commit 593230b19c
1 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/ride/ride_ratings.c
View File

@@ -1018,7 +1018,7 @@ static rating_tuple get_special_track_elements_rating(uint8 type, rct_ride *ride
*
* rct2: 0x0065DDD1
*/
static rating_tuple sub_65DDD1(rct_ride *ride)
static rating_tuple ride_ratings_get_turns_ratings(rct_ride *ride)
{
int excitement = 0, intensity = 0, nausea = 0;
@@ -1257,9 +1257,9 @@ static void ride_ratings_apply_gforces(rating_tuple *ratings, rct_ride *ride, in
ratings->nausea += (subRating.nausea * nauseaMultiplier) >> 16;
}
static void ride_ratings_apply_65DDD1(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier)
static void ride_ratings_apply_turns(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier)
{
rating_tuple subRating = sub_65DDD1(ride);
rating_tuple subRating = ride_ratings_get_turns_ratings(ride);
ratings->excitement += (subRating.excitement * excitementMultiplier) >> 16;
ratings->intensity += (subRating.intensity * intensityMultiplier) >> 16;
ratings->nausea += (subRating.nausea * nauseaMultiplier) >> 16;
@@ -1373,7 +1373,7 @@ static void ride_ratings_calculate_spiral_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 364088, 400497);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 36864, 30384, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 28235, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 28235, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 43690, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -1418,7 +1418,7 @@ static void ride_ratings_calculate_stand_up_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 59578);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 34952, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 12850, 28398, 30427);
ride_ratings_apply_proximity(&ratings, ride, 17893);
@@ -1456,7 +1456,7 @@ static void ride_ratings_calculate_suspended_swinging_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 32768, 23831, 79437);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 48036);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 48036);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -1496,7 +1496,7 @@ static void ride_ratings_calculate_inverted_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 29789, 55606);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 29552, 57186);
ride_ratings_apply_turns(&ratings, ride, 26749, 29552, 57186);
ride_ratings_apply_drops(&ratings, ride, 29127, 39009, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 15291, 35108);
ride_ratings_apply_proximity(&ratings, ride, 15657);
@@ -1539,7 +1539,7 @@ static void ride_ratings_calculate_junior_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 20480, 23831, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -1649,7 +1649,7 @@ static void ride_ratings_calculate_mini_suspended_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 34179, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 34179, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 58254, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 19275, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -1719,7 +1719,7 @@ static void ride_ratings_calculate_wooden_wild_mouse(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 102400, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 29721, 43458, 45749);
ride_ratings_apply_turns(&ratings, ride, 29721, 43458, 45749);
ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 17893);
@@ -1760,7 +1760,7 @@ static void ride_ratings_calculate_steeplechase(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 20480, 20852, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -1799,7 +1799,7 @@ static void ride_ratings_calculate_car_ride(rct_ride *ride)
ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424);
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 11437);
ride_ratings_apply_turns(&ratings, ride, 14860, 0, 11437);
ride_ratings_apply_drops(&ratings, ride, 8738, 0, 0);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 12850, 6553, 4681);
ride_ratings_apply_proximity(&ratings, ride, 11183);
@@ -1886,7 +1886,7 @@ static void ride_ratings_calculate_bobsleigh_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 65536, 23831, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -1955,7 +1955,7 @@ static void ride_ratings_calculate_looping_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -2000,7 +2000,7 @@ static void ride_ratings_calculate_dinghy_slide(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 65536, 29789, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 11183);
@@ -2038,7 +2038,7 @@ static void ride_ratings_calculate_mine_train_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 40960, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 29721, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 29721, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 19275, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 21472);
@@ -2076,7 +2076,7 @@ static void ride_ratings_calculate_chairlift(rct_ride *ride)
ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424);
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_65DDD1(&ratings, ride, 7430, 3476, 4574);
ride_ratings_apply_turns(&ratings, ride, 7430, 3476, 4574);
ride_ratings_apply_sheltered_ratings(&ratings, ride, -19275, 21845, 23405);
ride_ratings_apply_proximity(&ratings, ride, 11183);
ride_ratings_apply_scenery(&ratings, ride, 25098);
@@ -2120,7 +2120,7 @@ static void ride_ratings_calculate_corkscrew_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -2228,7 +2228,7 @@ static void ride_ratings_calculate_go_karts(rct_ride *ride)
ratings.intensity += lapsFactor / 2;
}
ride_ratings_apply_65DDD1(&ratings, ride, 4458, 3476, 5718);
ride_ratings_apply_turns(&ratings, ride, 4458, 3476, 5718);
ride_ratings_apply_drops(&ratings, ride, 8738, 5461, 6553);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 2570, 8738, 2340);
ride_ratings_apply_proximity(&ratings, ride, 11183);
@@ -2265,7 +2265,7 @@ static void ride_ratings_calculate_log_flume(rct_ride *ride)
ride_ratings_apply_synchronisation(&ratings, ride, RIDE_RATING(0,40), RIDE_RATING(0,05));
ride_ratings_apply_max_speed(&ratings, ride, 531372, 655360, 301111);
ride_ratings_apply_duration(&ratings, ride, 300, 13107);
ride_ratings_apply_65DDD1(&ratings, ride, 22291, 20860, 4574);
ride_ratings_apply_turns(&ratings, ride, 22291, 20860, 4574);
ride_ratings_apply_drops(&ratings, ride, 69905, 62415, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 22367);
@@ -2298,7 +2298,7 @@ static void ride_ratings_calculate_river_rapids(rct_ride *ride)
ride_ratings_apply_synchronisation(&ratings, ride, RIDE_RATING(0,30), RIDE_RATING(0,05));
ride_ratings_apply_max_speed(&ratings, ride, 115130, 159411, 106274);
ride_ratings_apply_duration(&ratings, ride, 500, 13107);
ride_ratings_apply_65DDD1(&ratings, ride, 29721, 22598, 5718);
ride_ratings_apply_turns(&ratings, ride, 29721, 22598, 5718);
ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 31314);
@@ -2713,7 +2713,7 @@ static void ride_ratings_calculate_vertical_drop_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 40960, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 58254, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -2811,7 +2811,7 @@ static void ride_ratings_calculate_flying_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 38130, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -2856,7 +2856,7 @@ static void ride_ratings_calculate_virginia_reel(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 110592, 29789, 59578);
ride_ratings_apply_65DDD1(&ratings, ride, 52012, 26075, 45749);
ride_ratings_apply_turns(&ratings, ride, 52012, 26075, 45749);
ride_ratings_apply_drops(&ratings, ride, 43690, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 22367);
@@ -2890,7 +2890,7 @@ static void ride_ratings_calculate_splash_boats(rct_ride *ride)
ride_ratings_apply_synchronisation(&ratings, ride, RIDE_RATING(0,40), RIDE_RATING(0,05));
ride_ratings_apply_max_speed(&ratings, ride, 797059, 655360, 301111);
ride_ratings_apply_duration(&ratings, ride, 500, 13107);
ride_ratings_apply_65DDD1(&ratings, ride, 22291, 20860, 4574);
ride_ratings_apply_turns(&ratings, ride, 22291, 20860, 4574);
ride_ratings_apply_drops(&ratings, ride, 87381, 93622, 62259);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 22367);
@@ -2925,7 +2925,7 @@ static void ride_ratings_calculate_mini_helicopters(rct_ride *ride)
ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424);
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 4574);
ride_ratings_apply_turns(&ratings, ride, 14860, 0, 4574);
ride_ratings_apply_drops(&ratings, ride, 8738, 0, 0);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 12850, 6553, 4681);
ride_ratings_apply_proximity(&ratings, ride, 8946);
@@ -2961,7 +2961,7 @@ static void ride_ratings_calculate_lay_down_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 38130, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -3052,7 +3052,7 @@ static void ride_ratings_calculate_reverser_roller_coaster(rct_ride *ride)
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 28672, 23831, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 43458, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 43458, 45749);
ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 22367);
@@ -3094,7 +3094,7 @@ static void ride_ratings_calculate_heartline_twister_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 44683, 89367);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 52150, 57186);
ride_ratings_apply_turns(&ratings, ride, 26749, 52150, 57186);
ride_ratings_apply_drops(&ratings, ride, 29127, 53052, 55705);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 34952, 35108);
ride_ratings_apply_proximity(&ratings, ride, 9841);
@@ -3128,7 +3128,7 @@ static void ride_ratings_calculate_mini_golf(rct_ride *ride)
rating_tuple ratings;
ride_ratings_set(&ratings, RIDE_RATING(1,50), RIDE_RATING(0,90), RIDE_RATING(0,00));
ride_ratings_apply_length(&ratings, ride, 6000, 873);
ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 0);
ride_ratings_apply_turns(&ratings, ride, 14860, 0, 0);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 5140, 6553, 4681);
ride_ratings_apply_proximity(&ratings, ride, 15657);
ride_ratings_apply_scenery(&ratings, ride, 27887);
@@ -3201,7 +3201,7 @@ static void ride_ratings_calculate_ghost_train(rct_ride *ride)
ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424);
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 11437);
ride_ratings_apply_turns(&ratings, ride, 14860, 0, 11437);
ride_ratings_apply_drops(&ratings, ride, 8738, 0, 0);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 6553, 4681);
ride_ratings_apply_proximity(&ratings, ride, 11183);
@@ -3237,7 +3237,7 @@ static void ride_ratings_calculate_twister_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 32768, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -3282,7 +3282,7 @@ static void ride_ratings_calculate_wooden_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 40960, 34555, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 43458, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 43458, 45749);
ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 22367);
@@ -3322,7 +3322,7 @@ static void ride_ratings_calculate_side_friction_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 28672, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 43458, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 43458, 45749);
ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 22367);
@@ -3361,7 +3361,7 @@ static void ride_ratings_calculate_wild_mouse(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 102400, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 29721, 43458, 45749);
ride_ratings_apply_turns(&ratings, ride, 29721, 43458, 45749);
ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 17893);
@@ -3401,7 +3401,7 @@ static void ride_ratings_calculate_multi_dimension_roller_coaster(rct_ride *ride
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 38130, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -3446,7 +3446,7 @@ static void ride_ratings_calculate_giga_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 364088, 400497);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 36864, 30384, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 28235, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 28235, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 43690, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -3582,7 +3582,7 @@ static void ride_ratings_calculate_monorail_cycles(rct_ride *ride)
ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424);
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 4574);
ride_ratings_apply_turns(&ratings, ride, 14860, 0, 4574);
ride_ratings_apply_drops(&ratings, ride, 8738, 0, 0);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 5140, 6553, 2340);
ride_ratings_apply_proximity(&ratings, ride, 8946);
@@ -3618,7 +3618,7 @@ static void ride_ratings_calculate_compact_inverted_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 30980, 55606);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 29552, 57186);
ride_ratings_apply_turns(&ratings, ride, 26749, 29552, 57186);
ride_ratings_apply_drops(&ratings, ride, 29127, 39009, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 15291, 35108);
ride_ratings_apply_proximity(&ratings, ride, 15657);
@@ -3661,7 +3661,7 @@ static void ride_ratings_calculate_water_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 20480, 23831, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -3733,7 +3733,7 @@ static void ride_ratings_calculate_inverted_hairpin_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 102400, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 29721, 43458, 45749);
ride_ratings_apply_turns(&ratings, ride, 29721, 43458, 45749);
ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 17893);
@@ -3824,7 +3824,7 @@ static void ride_ratings_calculate_river_rafts(rct_ride *ride)
ride_ratings_apply_synchronisation(&ratings, ride, RIDE_RATING(0,40), RIDE_RATING(0,05));
ride_ratings_apply_max_speed(&ratings, ride, 531372, 655360, 301111);
ride_ratings_apply_duration(&ratings, ride, 500, 13107);
ride_ratings_apply_65DDD1(&ratings, ride, 22291, 20860, 4574);
ride_ratings_apply_turns(&ratings, ride, 22291, 20860, 4574);
ride_ratings_apply_drops(&ratings, ride, 78643, 93622, 62259);
ride_ratings_apply_proximity(&ratings, ride, 13420);
ride_ratings_apply_scenery(&ratings, ride, 11155);
@@ -3890,7 +3890,7 @@ static void ride_ratings_calculate_inverted_impulse_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 29789, 55606);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 29552, 57186);
ride_ratings_apply_turns(&ratings, ride, 26749, 29552, 57186);
ride_ratings_apply_drops(&ratings, ride, 29127, 39009, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 15291, 35108);
ride_ratings_apply_proximity(&ratings, ride, 15657);
@@ -3927,7 +3927,7 @@ static void ride_ratings_calculate_mini_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 20480, 23831, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
@@ -3966,7 +3966,7 @@ static void ride_ratings_calculate_mine_ride(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 40960, 29789, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 29721, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 29721, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 19275, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 21472);
@@ -4002,7 +4002,7 @@ static void ride_ratings_calculate_lim_launched_roller_coaster(rct_ride *ride)
ride_ratings_apply_average_speed(&ratings, ride, 291271, 436906);
ride_ratings_apply_duration(&ratings, ride, 150, 26214);
ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 49648);
ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_turns(&ratings, ride, 26749, 34767, 45749);
ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152);
ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);