From a50b0c4200c415bafb42fcb2f010e5fe90e79bd2 Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Thu, 19 Mar 2015 22:14:42 +0000 Subject: [PATCH] Label max/min cars in train offset --- src/peep/peep.c | 1 - src/ride/ride.h | 4 ++-- src/windows/ride.c | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index 8d0ab68878..5efd35c057 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -1157,7 +1157,6 @@ void peep_update_ride_sub_state_1(rct_peep* peep){ rct_ride_type_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type]; if (vehicle_type->var_14 & (1 << 10)){ - //692378 sint16 x, y, z; x = ride->entrances[peep->current_ride_station] & 0xFF; y = ride->entrances[peep->current_ride_station] >> 8; diff --git a/src/ride/ride.h b/src/ride/ride.h index 0b45ece1ca..4a8de7a1f0 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -105,8 +105,8 @@ typedef struct { uint8 var_00C; uint8 var_00D; uint8 var_00E; - uint8 var_00F; - uint8 var_010; + uint8 min_cars_in_train; // 0x00F + uint8 max_cars_in_train; // 0x010 uint8 var_011; uint8 var_012; uint8 var_013; diff --git a/src/windows/ride.c b/src/windows/ride.c index dd63c5d7ac..b8d44ed180 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -2390,7 +2390,7 @@ static void window_ride_vehicle_dropdown() break; case WIDX_VEHICLE_CARS_PER_TRAIN_DROPDOWN: RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 1019; - game_do_command(0, (1 << 8) | 1, 0, ((rideEntry->var_00F + dropdownIndex) << 8) | w->number, GAME_COMMAND_9, 0, 0); + game_do_command(0, (1 << 8) | 1, 0, ((rideEntry->min_cars_in_train + dropdownIndex) << 8) | w->number, GAME_COMMAND_9, 0, 0); break; } } @@ -2461,7 +2461,7 @@ static void window_ride_vehicle_invalidate() } // Cars per train - if (rideEntry->var_012 + 1 < rideEntry->var_010) { + if (rideEntry->var_012 + 1 < rideEntry->max_cars_in_train) { window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN].image = carsPerTrain > 1 ? 1023 : 1022; window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WWT_DROPDOWN; window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN_DROPDOWN].type = WWT_DROPDOWN_BUTTON; @@ -3739,7 +3739,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid dropdownWidget->bottom - dropdownWidget->top + 1, w->colours[1], 0, - rideEntry->var_010 > 1 ? 3 : 2, + rideEntry->max_cars_in_train > 1 ? 3 : 2, widget->right - dropdownWidget->left );