From 5585a3e67d0472a51a872d08d5568da438a25728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 30 Oct 2016 21:56:30 +0100 Subject: [PATCH 1/4] Fix #4722: warnings with clang 3.9 --- src/interface/console.c | 4 ++-- src/paint/map_element/surface.c | 2 +- src/windows/title_editor.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/interface/console.c b/src/interface/console.c index 9bc3e8be13..8ed875e56a 100644 --- a/src/interface/console.c +++ b/src/interface/console.c @@ -316,14 +316,14 @@ void console_writeline(const utf8 *src) void console_writeline_error(const utf8 *src) { safe_strcpy(_consoleErrorBuffer + 1, src, CONSOLE_BUFFER_2_SIZE - 1); - _consoleErrorBuffer[0] = FORMAT_RED; + _consoleErrorBuffer[0] = (utf8)FORMAT_RED; console_writeline(_consoleErrorBuffer); } void console_writeline_warning(const utf8 *src) { safe_strcpy(_consoleErrorBuffer + 1, src, CONSOLE_BUFFER_2_SIZE - 1); - _consoleErrorBuffer[0] = FORMAT_YELLOW; + _consoleErrorBuffer[0] = (utf8)FORMAT_YELLOW; console_writeline(_consoleErrorBuffer); } diff --git a/src/paint/map_element/surface.c b/src/paint/map_element/surface.c index 0d5ab35926..461dd98fc1 100644 --- a/src/paint/map_element/surface.c +++ b/src/paint/map_element/surface.c @@ -1113,7 +1113,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) } - sub_98196C(image_id, 0, 0, 32, 32, 255, height, rotation); + sub_98196C(image_id, 0, 0, 32, 32, -1, height, rotation); has_surface = true; } diff --git a/src/windows/title_editor.c b/src/windows/title_editor.c index b283456b24..c1b0db1e1e 100644 --- a/src/windows/title_editor.c +++ b/src/windows/title_editor.c @@ -907,7 +907,7 @@ void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int } else { format_string(buffer + 1, 255, STR_STRING, gCommonFormatArgs); - buffer[0] = FORMAT_BLACK; + buffer[0] = (utf8)FORMAT_BLACK; } set_format_arg(0, uintptr_t, &buffer); gfx_draw_string_left(dpi, STR_STRING, gCommonFormatArgs, w->colours[1], x + 5, y); @@ -982,7 +982,7 @@ void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int } else { format_string(buffer + 1, 255, commandName, gCommonFormatArgs); - buffer[0] = (error ? ((selected || hover) ? FORMAT_LIGHTPINK : FORMAT_RED) : FORMAT_BLACK); + buffer[0] = (utf8)(error ? ((selected || hover) ? FORMAT_LIGHTPINK : FORMAT_RED) : FORMAT_BLACK); } set_format_arg(0, uintptr_t, &buffer); gfx_draw_string_left(dpi, STR_STRING, gCommonFormatArgs, w->colours[1], x + 5, y); From ff8fa26eab77af05d7b998bdb2a762d39cd846eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 30 Oct 2016 22:00:26 +0100 Subject: [PATCH 2/4] Fix argument values to ride_ratings_apply_65E1C2 --- src/ride/ride_ratings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ride/ride_ratings.c b/src/ride/ride_ratings.c index 6f4fed981a..8c95d455d9 100644 --- a/src/ride/ride_ratings.c +++ b/src/ride/ride_ratings.c @@ -1575,7 +1575,7 @@ static void ride_ratings_calculate_miniature_railway(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_65E1C2(&ratings, ride, 4294960871, 6553, 23405); + ride_ratings_apply_65E1C2(&ratings, ride, -6425, 6553, 23405); ride_ratings_apply_proximity(&ratings, ride, 8946); ride_ratings_apply_scenery(&ratings, ride, 20915); ride_ratings_apply_first_length_penalty(&ratings, ride, 0xC80000, 2, 2, 2); @@ -2077,7 +2077,7 @@ static void ride_ratings_calculate_chairlift(rct_ride *ride) 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_65E1C2(&ratings, ride, 4294948021, 21845, 23405); + ride_ratings_apply_65E1C2(&ratings, ride, -19275, 21845, 23405); ride_ratings_apply_proximity(&ratings, ride, 11183); ride_ratings_apply_scenery(&ratings, ride, 25098); ride_ratings_apply_first_length_penalty(&ratings, ride, 0x960000, 2, 2, 2); From ccc3297424dbcaf901a9a703ccc789a0551e7af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 30 Oct 2016 22:07:07 +0100 Subject: [PATCH 3/4] Rename 65E1C2 to sheltered_ratings --- src/ride/ride_ratings.c | 100 ++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/src/ride/ride_ratings.c b/src/ride/ride_ratings.c index 8c95d455d9..acb9b6a002 100644 --- a/src/ride/ride_ratings.c +++ b/src/ride/ride_ratings.c @@ -1055,7 +1055,7 @@ static rating_tuple sub_65DDD1(rct_ride *ride) * * rct2: 0x0065E1C2 */ -static rating_tuple sub_65E1C2(rct_ride *ride) +static rating_tuple ride_ratings_get_sheltered_ratings(rct_ride *ride) { int sheltered_length_shifted = (ride->sheltered_length) >> 16; uint32 eax = min(sheltered_length_shifted, 1000); @@ -1273,9 +1273,9 @@ static void ride_ratings_apply_drops(rating_tuple *ratings, rct_ride *ride, int ratings->nausea += (subRating.nausea * nauseaMultiplier) >> 16; } -static void ride_ratings_apply_65E1C2(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier) +static void ride_ratings_apply_sheltered_ratings(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier) { - rating_tuple subRating = sub_65E1C2(ride); + rating_tuple subRating = ride_ratings_get_sheltered_ratings(ride); ratings->excitement += (subRating.excitement * excitementMultiplier) >> 16; ratings->intensity += (subRating.intensity * intensityMultiplier) >> 16; ratings->nausea += (subRating.nausea * nauseaMultiplier) >> 16; @@ -1375,7 +1375,7 @@ static void ride_ratings_calculate_spiral_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 36864, 30384, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 28235, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 43690, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); @@ -1420,7 +1420,7 @@ static void ride_ratings_calculate_stand_up_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 59578); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 34952, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 12850, 28398, 30427); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 12850, 28398, 30427); ride_ratings_apply_proximity(&ratings, ride, 17893); ride_ratings_apply_scenery(&ratings, ride, 5577); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 12, 2, 2, 2); @@ -1458,7 +1458,7 @@ static void ride_ratings_calculate_suspended_swinging_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 32768, 23831, 79437); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 48036); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6971); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 8, 2, 2, 2); @@ -1498,7 +1498,7 @@ static void ride_ratings_calculate_inverted_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 29789, 55606); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 29552, 57186); ride_ratings_apply_drops(&ratings, ride, 29127, 39009, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 15291, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 15291, 35108); ride_ratings_apply_proximity(&ratings, ride, 15657); ride_ratings_apply_scenery(&ratings, ride, 8366); @@ -1541,7 +1541,7 @@ static void ride_ratings_calculate_junior_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 20480, 23831, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 25700, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 9760); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 6, 2, 2, 2); @@ -1575,7 +1575,7 @@ static void ride_ratings_calculate_miniature_railway(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_65E1C2(&ratings, ride, -6425, 6553, 23405); + ride_ratings_apply_sheltered_ratings(&ratings, ride, -6425, 6553, 23405); ride_ratings_apply_proximity(&ratings, ride, 8946); ride_ratings_apply_scenery(&ratings, ride, 20915); ride_ratings_apply_first_length_penalty(&ratings, ride, 0xC80000, 2, 2, 2); @@ -1611,7 +1611,7 @@ static void ride_ratings_calculate_monorail(rct_ride *ride) ride_ratings_apply_max_speed(&ratings, ride, 44281, 70849, 35424); ride_ratings_apply_average_speed(&ratings, ride, 291271, 218453); ride_ratings_apply_duration(&ratings, ride, 150, 21845); - ride_ratings_apply_65E1C2(&ratings, ride, 5140, 6553, 18724); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 5140, 6553, 18724); ride_ratings_apply_proximity(&ratings, ride, 8946); ride_ratings_apply_scenery(&ratings, ride, 16732); ride_ratings_apply_first_length_penalty(&ratings, ride, 0xAA0000, 2, 2, 2); @@ -1651,7 +1651,7 @@ static void ride_ratings_calculate_mini_suspended_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 34179, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 58254, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 19275, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 19275, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 13943); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 6, 2, 2, 2); @@ -1721,7 +1721,7 @@ static void ride_ratings_calculate_wooden_wild_mouse(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 102400, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 29721, 43458, 45749); ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 17893); ride_ratings_apply_scenery(&ratings, ride, 5577); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 8, 2, 2, 2); @@ -1762,7 +1762,7 @@ static void ride_ratings_calculate_steeplechase(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 20480, 20852, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 25700, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 9760); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 4, 2, 2, 2); @@ -1801,7 +1801,7 @@ static void ride_ratings_calculate_car_ride(rct_ride *ride) ride_ratings_apply_duration(&ratings, ride, 150, 26214); ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 11437); ride_ratings_apply_drops(&ratings, ride, 8738, 0, 0); - ride_ratings_apply_65E1C2(&ratings, ride, 12850, 6553, 4681); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 12850, 6553, 4681); ride_ratings_apply_proximity(&ratings, ride, 11183); ride_ratings_apply_scenery(&ratings, ride, 8366); ride_ratings_apply_first_length_penalty(&ratings, ride, 0xC80000, 8, 2, 2); @@ -1888,7 +1888,7 @@ static void ride_ratings_calculate_bobsleigh_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 65536, 23831, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 5577); ride_ratings_apply_max_speed_penalty(&ratings, ride, 0xC0000, 2, 2, 2); @@ -1957,7 +1957,7 @@ static void ride_ratings_calculate_looping_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); @@ -2002,7 +2002,7 @@ static void ride_ratings_calculate_dinghy_slide(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 65536, 29789, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 11183); ride_ratings_apply_scenery(&ratings, ride, 5577); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 12, 2, 2, 2); @@ -2040,7 +2040,7 @@ static void ride_ratings_calculate_mine_train_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 40960, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 29721, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 19275, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 19275, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 21472); ride_ratings_apply_scenery(&ratings, ride, 16732); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 8, 2, 2, 2); @@ -2077,7 +2077,7 @@ static void ride_ratings_calculate_chairlift(rct_ride *ride) 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_65E1C2(&ratings, ride, -19275, 21845, 23405); + ride_ratings_apply_sheltered_ratings(&ratings, ride, -19275, 21845, 23405); ride_ratings_apply_proximity(&ratings, ride, 11183); ride_ratings_apply_scenery(&ratings, ride, 25098); ride_ratings_apply_first_length_penalty(&ratings, ride, 0x960000, 2, 2, 2); @@ -2122,7 +2122,7 @@ static void ride_ratings_calculate_corkscrew_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); @@ -2230,7 +2230,7 @@ static void ride_ratings_calculate_go_karts(rct_ride *ride) ride_ratings_apply_65DDD1(&ratings, ride, 4458, 3476, 5718); ride_ratings_apply_drops(&ratings, ride, 8738, 5461, 6553); - ride_ratings_apply_65E1C2(&ratings, ride, 2570, 8738, 2340); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 2570, 8738, 2340); ride_ratings_apply_proximity(&ratings, ride, 11183); ride_ratings_apply_scenery(&ratings, ride, 16732); @@ -2267,7 +2267,7 @@ static void ride_ratings_calculate_log_flume(rct_ride *ride) ride_ratings_apply_duration(&ratings, ride, 300, 13107); ride_ratings_apply_65DDD1(&ratings, ride, 22291, 20860, 4574); ride_ratings_apply_drops(&ratings, ride, 69905, 62415, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 22367); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 2, 2, 2, 2); @@ -2300,7 +2300,7 @@ static void ride_ratings_calculate_river_rapids(rct_ride *ride) ride_ratings_apply_duration(&ratings, ride, 500, 13107); ride_ratings_apply_65DDD1(&ratings, ride, 29721, 22598, 5718); ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 31314); ride_ratings_apply_scenery(&ratings, ride, 13943); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 2, 2, 2, 2); @@ -2645,7 +2645,7 @@ static void ride_ratings_calculate_reverse_freefall_coaster(rct_ride *ride) ride_ratings_apply_synchronisation(&ratings, ride, RIDE_RATING(0,60), RIDE_RATING(0,15)); ride_ratings_apply_max_speed(&ratings, ride, 436906, 436906, 320398); ride_ratings_apply_gforces(&ratings, ride, 24576, 41704, 59578); - ride_ratings_apply_65E1C2(&ratings, ride, 12850, 28398, 11702); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 12850, 28398, 11702); ride_ratings_apply_proximity(&ratings, ride, 17893); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 34, 2, 2, 2); @@ -2715,7 +2715,7 @@ static void ride_ratings_calculate_vertical_drop_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 40960, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 58254, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 20, 2, 2, 2); @@ -2813,7 +2813,7 @@ static void ride_ratings_calculate_flying_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 38130, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); @@ -2858,7 +2858,7 @@ static void ride_ratings_calculate_virginia_reel(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 110592, 29789, 59578); ride_ratings_apply_65DDD1(&ratings, ride, 52012, 26075, 45749); ride_ratings_apply_drops(&ratings, ride, 43690, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 22367); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_first_length_penalty(&ratings, ride, 0xD20000, 2, 2, 2); @@ -2892,7 +2892,7 @@ static void ride_ratings_calculate_splash_boats(rct_ride *ride) ride_ratings_apply_duration(&ratings, ride, 500, 13107); ride_ratings_apply_65DDD1(&ratings, ride, 22291, 20860, 4574); ride_ratings_apply_drops(&ratings, ride, 87381, 93622, 62259); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 22367); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 6, 2, 2, 2); @@ -2927,7 +2927,7 @@ static void ride_ratings_calculate_mini_helicopters(rct_ride *ride) ride_ratings_apply_duration(&ratings, ride, 150, 26214); ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 4574); ride_ratings_apply_drops(&ratings, ride, 8738, 0, 0); - ride_ratings_apply_65E1C2(&ratings, ride, 12850, 6553, 4681); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 12850, 6553, 4681); ride_ratings_apply_proximity(&ratings, ride, 8946); ride_ratings_apply_scenery(&ratings, ride, 8366); ride_ratings_apply_first_length_penalty(&ratings, ride, 0xA00000, 2, 2, 2); @@ -2963,7 +2963,7 @@ static void ride_ratings_calculate_lay_down_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 38130, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); @@ -3007,7 +3007,7 @@ static void ride_ratings_calculate_suspended_monorail(rct_ride *ride) ride_ratings_apply_max_speed(&ratings, ride, 44281, 70849, 35424); ride_ratings_apply_average_speed(&ratings, ride, 291271, 218453); ride_ratings_apply_duration(&ratings, ride, 150, 21845); - ride_ratings_apply_65E1C2(&ratings, ride, 5140, 6553, 18724); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 5140, 6553, 18724); ride_ratings_apply_proximity(&ratings, ride, 12525); ride_ratings_apply_scenery(&ratings, ride, 25098); ride_ratings_apply_first_length_penalty(&ratings, ride, 0xAA0000, 2, 2, 2); @@ -3054,7 +3054,7 @@ static void ride_ratings_calculate_reverser_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 28672, 23831, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 43458, 45749); ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 22367); ride_ratings_apply_scenery(&ratings, ride, 11155); @@ -3096,7 +3096,7 @@ static void ride_ratings_calculate_heartline_twister_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 44683, 89367); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 52150, 57186); ride_ratings_apply_drops(&ratings, ride, 29127, 53052, 55705); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 34952, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 34952, 35108); ride_ratings_apply_proximity(&ratings, ride, 9841); ride_ratings_apply_scenery(&ratings, ride, 3904); @@ -3129,7 +3129,7 @@ static void ride_ratings_calculate_mini_golf(rct_ride *ride) 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_65E1C2(&ratings, ride, 5140, 6553, 4681); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 5140, 6553, 4681); ride_ratings_apply_proximity(&ratings, ride, 15657); ride_ratings_apply_scenery(&ratings, ride, 27887); @@ -3203,7 +3203,7 @@ static void ride_ratings_calculate_ghost_train(rct_ride *ride) ride_ratings_apply_duration(&ratings, ride, 150, 26214); ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 11437); ride_ratings_apply_drops(&ratings, ride, 8738, 0, 0); - ride_ratings_apply_65E1C2(&ratings, ride, 25700, 6553, 4681); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 6553, 4681); ride_ratings_apply_proximity(&ratings, ride, 11183); ride_ratings_apply_scenery(&ratings, ride, 8366); ride_ratings_apply_first_length_penalty(&ratings, ride, 0xB40000, 2, 2, 2); @@ -3239,7 +3239,7 @@ static void ride_ratings_calculate_twister_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 32768, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); @@ -3284,7 +3284,7 @@ static void ride_ratings_calculate_wooden_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 40960, 34555, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 43458, 45749); ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 22367); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 12, 2, 2, 2); @@ -3324,7 +3324,7 @@ static void ride_ratings_calculate_side_friction_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 28672, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 43458, 45749); ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 22367); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 6, 2, 2, 2); @@ -3363,7 +3363,7 @@ static void ride_ratings_calculate_wild_mouse(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 102400, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 29721, 43458, 45749); ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 17893); ride_ratings_apply_scenery(&ratings, ride, 5577); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 6, 2, 2, 2); @@ -3403,7 +3403,7 @@ static void ride_ratings_calculate_multi_dimension_roller_coaster(rct_ride *ride ride_ratings_apply_gforces(&ratings, ride, 24576, 38130, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); @@ -3448,7 +3448,7 @@ static void ride_ratings_calculate_giga_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 36864, 30384, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 28235, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 43690, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); @@ -3584,7 +3584,7 @@ static void ride_ratings_calculate_monorail_cycles(rct_ride *ride) ride_ratings_apply_duration(&ratings, ride, 150, 26214); ride_ratings_apply_65DDD1(&ratings, ride, 14860, 0, 4574); ride_ratings_apply_drops(&ratings, ride, 8738, 0, 0); - ride_ratings_apply_65E1C2(&ratings, ride, 5140, 6553, 2340); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 5140, 6553, 2340); ride_ratings_apply_proximity(&ratings, ride, 8946); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_first_length_penalty(&ratings, ride, 0x8C0000, 2, 2, 2); @@ -3620,7 +3620,7 @@ static void ride_ratings_calculate_compact_inverted_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 30980, 55606); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 29552, 57186); ride_ratings_apply_drops(&ratings, ride, 29127, 39009, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 15291, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 15291, 35108); ride_ratings_apply_proximity(&ratings, ride, 15657); ride_ratings_apply_scenery(&ratings, ride, 8366); @@ -3663,7 +3663,7 @@ static void ride_ratings_calculate_water_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 20480, 23831, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 25700, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 9760); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 8, 2, 2, 2); @@ -3699,7 +3699,7 @@ static void ride_ratings_calculate_air_powered_vertical_coaster(rct_ride *ride) ride_ratings_apply_synchronisation(&ratings, ride, RIDE_RATING(0,60), RIDE_RATING(0,05)); ride_ratings_apply_max_speed(&ratings, ride, 509724, 364088, 320398); ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 59578); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 21845, 11702); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 21845, 11702); ride_ratings_apply_proximity(&ratings, ride, 17893); ride_ratings_apply_scenery(&ratings, ride, 11155); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 34, 2, 1, 1); @@ -3735,7 +3735,7 @@ static void ride_ratings_calculate_inverted_hairpin_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 102400, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 29721, 43458, 45749); ride_ratings_apply_drops(&ratings, ride, 40777, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 16705, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 16705, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 17893); ride_ratings_apply_scenery(&ratings, ride, 5577); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 8, 2, 2, 2); @@ -3892,7 +3892,7 @@ static void ride_ratings_calculate_inverted_impulse_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 29789, 55606); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 29552, 57186); ride_ratings_apply_drops(&ratings, ride, 29127, 39009, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 15291, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 15291, 35108); ride_ratings_apply_proximity(&ratings, ride, 15657); ride_ratings_apply_scenery(&ratings, ride, 9760); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 20, 2, 2, 2); @@ -3929,7 +3929,7 @@ static void ride_ratings_calculate_mini_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 20480, 23831, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 25700, 30583, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 25700, 30583, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 9760); ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 12, 2, 2, 2); @@ -3968,7 +3968,7 @@ static void ride_ratings_calculate_mine_ride(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 40960, 29789, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 29721, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 19275, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 19275, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 21472); ride_ratings_apply_scenery(&ratings, ride, 16732); ride_ratings_apply_first_length_penalty(&ratings, ride, 0x10E0000, 2, 2, 2); @@ -4004,7 +4004,7 @@ static void ride_ratings_calculate_lim_launched_roller_coaster(rct_ride *ride) ride_ratings_apply_gforces(&ratings, ride, 24576, 35746, 49648); ride_ratings_apply_65DDD1(&ratings, ride, 26749, 34767, 45749); ride_ratings_apply_drops(&ratings, ride, 29127, 46811, 49152); - ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108); + ride_ratings_apply_sheltered_ratings(&ratings, ride, 15420, 32768, 35108); ride_ratings_apply_proximity(&ratings, ride, 20130); ride_ratings_apply_scenery(&ratings, ride, 6693); From 593230b19c42692566eb0fed9e5e5b83f70cfbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 30 Oct 2016 22:09:59 +0100 Subject: [PATCH 4/4] Rename 65DDD1 to turns_ratings --- src/ride/ride_ratings.c | 92 ++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/src/ride/ride_ratings.c b/src/ride/ride_ratings.c index acb9b6a002..f54fb40160 100644 --- a/src/ride/ride_ratings.c +++ b/src/ride/ride_ratings.c @@ -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);