mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

fix vehicle type dropdown in ride window and 0% rating modifiers, fixes #696, fixes #699

Browse Source
This commit is contained in:
IntelOrca
2015-01-17 19:13:05 +00:00
parent 78d90fd8aa
commit c88cde8472
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/windows/ride.c
View File

@@ -2431,7 +2431,7 @@ static void window_ride_vehicle_invalidate()
// Vehicle type // Vehicle type
window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].image = rideEntry->name; 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].type = WWT_14;
window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE_DROPDOWN].type = WWT_EMPTY; window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE_DROPDOWN].type = WWT_EMPTY;
w->enabled_widgets &= ~(1 << WIDX_VEHICLE_TYPE); w->enabled_widgets &= ~(1 << WIDX_VEHICLE_TYPE);
@@ -2508,20 +2508,26 @@ static void window_ride_vehicle_paint()
if (!(rideEntry->var_008 & 0x2000) && var_496(w) > 1) { if (!(rideEntry->var_008 & 0x2000) && var_496(w) > 1) {
// Excitement Factor // Excitement Factor
factor = rideEntry->excitement_multipler; factor = rideEntry->excitement_multipler;
if (factor > 0) {
gfx_draw_string_left(dpi, 3125, &factor, 0, x, y); gfx_draw_string_left(dpi, 3125, &factor, 0, x, y);
y += 10; y += 10;
}
// Intensity Factor // Intensity Factor
factor = rideEntry->intensity_multipler; factor = rideEntry->intensity_multipler;
if (factor > 0) {
gfx_draw_string_left(dpi, 3126, &factor, 0, x, y); gfx_draw_string_left(dpi, 3126, &factor, 0, x, y);
y += 10; y += 10;
}
// Nausea Factor // Nausea Factor
factor = rideEntry->nausea_multipler; factor = rideEntry->nausea_multipler;
if (factor > 0) {
gfx_draw_string_left(dpi, 3127, &factor, 0, x, y); gfx_draw_string_left(dpi, 3127, &factor, 0, x, y);
y += 10; y += 10;
} }
} }
}
typedef struct { typedef struct {
short x; short x;