mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #20404 from duncanspumpkin/rideWindow
Ride Window refactor
This commit is contained in:
commit
ce1695fab8
|
@ -455,19 +455,10 @@ public:
|
|||
case INTENT_ACTION_INVALIDATE_VEHICLE_WINDOW:
|
||||
{
|
||||
auto vehicle = static_cast<Vehicle*>(intent.GetPointerExtra(INTENT_EXTRA_VEHICLE));
|
||||
auto* w = WindowFindByNumber(WindowClass::Ride, vehicle->ride.ToUnderlying());
|
||||
if (w == nullptr)
|
||||
return;
|
||||
|
||||
auto ride = vehicle->GetRide();
|
||||
auto viewVehicleIndex = w->ride.view - 1;
|
||||
if (ride == nullptr || viewVehicleIndex < 0 || viewVehicleIndex >= ride->NumTrains)
|
||||
return;
|
||||
|
||||
if (vehicle->Id != ride->vehicles[viewVehicleIndex])
|
||||
return;
|
||||
|
||||
w->Invalidate();
|
||||
if (vehicle != nullptr)
|
||||
{
|
||||
WindowRideInvalidateVehicle(*vehicle);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -140,6 +140,7 @@ void WindowRideListRefreshList(WindowBase* w);
|
|||
WindowBase* WindowRideMainOpen(const Ride& ride);
|
||||
WindowBase* WindowRideOpenTrack(TileElement* tileElement);
|
||||
WindowBase* WindowRideOpenVehicle(Vehicle* vehicle);
|
||||
void WindowRideInvalidateVehicle(const Vehicle& vehicle);
|
||||
void WindowRideMeasurementsDesignCancel();
|
||||
|
||||
// rct2: 0x00F635EE
|
||||
|
|
|
@ -280,13 +280,6 @@ struct NewRideVariables
|
|||
uint16_t selected_ride_countdown; // 488
|
||||
};
|
||||
|
||||
struct RideVariables
|
||||
{
|
||||
int16_t view;
|
||||
int32_t var_482;
|
||||
int32_t var_486;
|
||||
};
|
||||
|
||||
struct TrackListVariables
|
||||
{
|
||||
bool track_list_being_updated;
|
||||
|
|
|
@ -59,7 +59,6 @@ struct WindowBase
|
|||
{
|
||||
CampaignVariables campaign;
|
||||
NewRideVariables new_ride;
|
||||
RideVariables ride;
|
||||
TrackListVariables track_list;
|
||||
ErrorVariables error;
|
||||
void* custom_info;
|
||||
|
|
Loading…
Reference in New Issue