From 6423c857a79f3c49eb25653b6d27e9a4f9f56461 Mon Sep 17 00:00:00 2001 From: Kevin Burke Date: Sun, 22 Mar 2015 12:27:15 -0700 Subject: [PATCH] Name var_199 as the downtime parameter --- src/ride/ride.c | 2 +- src/ride/ride.h | 4 ++-- src/windows/ride.c | 3 +-- src/windows/ride_list.c | 4 ++-- src/world/park.c | 8 +++----- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/ride/ride.c b/src/ride/ride.c index 54bd711b70..433cdbfd6a 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -1357,7 +1357,7 @@ static void ride_breakdown_update(int rideIndex) ride->var_1A0 + ride->var_1A2 + ride->var_1A3; - ride->var_199 = min(ax / 2, 100); + ride->downtime = min(ax / 2, 100); ride->var_1A3 = ride->var_1A2; ride->var_1A2 = ride->var_1A1; diff --git a/src/ride/ride.h b/src/ride/ride.h index 767030ea92..82580c58fd 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -259,8 +259,8 @@ typedef struct { // Small constant used to increase the unreliability as the game continues, // making breakdowns more and more likely. uint8 unreliability_factor; - // Down time - uint8 var_199; + // Range from [0, 100] + uint8 downtime; // 0x199 uint8 inspection_interval; // 0x19A uint8 last_inspection; // 0x19B uint8 var_19C; diff --git a/src/windows/ride.c b/src/windows/ride.c index 658a0baac2..3e0a507d21 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -3439,8 +3439,7 @@ static void window_ride_maintenance_paint() window_ride_maintenance_draw_bar(w, dpi, x + 103, y, max(10, reliability), 14); y += 11; - // Down time - downTime = ride->var_199; + downTime = ride->downtime; gfx_draw_string_left(dpi, STR_DOWN_TIME_LABEL_1889, &downTime, 0, x, y); window_ride_maintenance_draw_bar(w, dpi, x + 103, y, downTime, 28); y += 26; diff --git a/src/windows/ride_list.c b/src/windows/ride_list.c index ff0d13f367..4db0193ba3 100644 --- a/src/windows/ride_list.c +++ b/src/windows/ride_list.c @@ -513,7 +513,7 @@ static void window_ride_list_scrollpaint() case INFORMATION_TYPE_DOWN_TIME: // edx = RCT2_GLOBAL(0x009ACFA4 + (ride->var_001 * 4), uint32); - RCT2_GLOBAL(0x013CE952 + 2, uint16) = ride->var_199; + RCT2_GLOBAL(0x013CE952 + 2, uint16) = ride->downtime; formatSecondary = STR_DOWN_TIME_LABEL; break; case INFORMATION_TYPE_GUESTS_FAVOURITE: @@ -670,7 +670,7 @@ static void window_ride_list_refresh_list(rct_window *w) case INFORMATION_TYPE_DOWN_TIME: while (--current_list_position >= 0) { otherRide = &g_ride_list[w->list_item_positions[current_list_position]]; - if (ride->var_199 <= otherRide->var_199) + if (ride->downtime <= otherRide->downtime) break; window_bubble_list_item(w, current_list_position); diff --git a/src/world/park.c b/src/world/park.c index f2f0344b56..a2d6c8cf63 100644 --- a/src/world/park.c +++ b/src/world/park.c @@ -203,15 +203,13 @@ int calculate_park_rating() // Rides { int i; - short _ax, total_ride_intensity = 0, total_ride_excitement = 0, average_intensity, average_excitement; + short total_ride_uptime = 0, total_ride_intensity = 0, total_ride_excitement = 0, average_intensity, average_excitement; int num_rides, num_exciting_rides = 0; rct_ride* ride; - // - _ax = 0; num_rides = 0; FOR_ALL_RIDES(i, ride) { - _ax += 100 - ride->var_199; + total_ride_uptime += 100 - ride->downtime; if (ride->excitement != -1){ total_ride_excitement += ride->excitement / 8; @@ -222,7 +220,7 @@ int calculate_park_rating() } result -= 200; if (num_rides > 0) - result += (_ax / num_rides) * 2; + result += (total_ride_uptime / num_rides) * 2; result -= 100;