From c88cde8472fdbd0683234c8d278b0a0863bc1282 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Sat, 17 Jan 2015 19:13:05 +0000 Subject: [PATCH] fix vehicle type dropdown in ride window and 0% rating modifiers, fixes #696, fixes #699 --- src/windows/ride.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/windows/ride.c b/src/windows/ride.c index a25e1e1274..c8f1e1d09b 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -2431,7 +2431,7 @@ static void window_ride_vehicle_invalidate() // Vehicle type window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].image = rideEntry->name; - if (var_496(w) <= 1 && (w->enabled_widgets & (1 << WIDX_TAB_10))) { + if (var_496(w) <= 1 || (w->enabled_widgets & (1 << WIDX_TAB_10))) { window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].type = WWT_14; window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE_DROPDOWN].type = WWT_EMPTY; w->enabled_widgets &= ~(1 << WIDX_VEHICLE_TYPE); @@ -2508,18 +2508,24 @@ static void window_ride_vehicle_paint() if (!(rideEntry->var_008 & 0x2000) && var_496(w) > 1) { // Excitement Factor factor = rideEntry->excitement_multipler; - gfx_draw_string_left(dpi, 3125, &factor, 0, x, y); - y += 10; + if (factor > 0) { + gfx_draw_string_left(dpi, 3125, &factor, 0, x, y); + y += 10; + } // Intensity Factor factor = rideEntry->intensity_multipler; - gfx_draw_string_left(dpi, 3126, &factor, 0, x, y); - y += 10; + if (factor > 0) { + gfx_draw_string_left(dpi, 3126, &factor, 0, x, y); + y += 10; + } // Nausea Factor factor = rideEntry->nausea_multipler; - gfx_draw_string_left(dpi, 3127, &factor, 0, x, y); - y += 10; + if (factor > 0) { + gfx_draw_string_left(dpi, 3127, &factor, 0, x, y); + y += 10; + } } }