mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #8724: Got wrong DepotID/StationID for airports, causing crash

This commit is contained in:
Charles Pigott 2021-02-22 13:50:32 +00:00
parent 80fb1c74f0
commit 6af49b7885
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/depot_gui.cpp
View File

@ -294,7 +294,7 @@ struct DepotWindow : Window {
~DepotWindow() ~DepotWindow()
{ {
DeleteWindowById(WC_BUILD_VEHICLE, this->window_number); DeleteWindowById(WC_BUILD_VEHICLE, this->window_number);
DeleteWindowById(GetWindowClassForVehicleType(this->type), VehicleListIdentifier(VL_DEPOT_LIST, this->type, this->owner, GetDepotIndex(this->window_number)).Pack(), false); DeleteWindowById(GetWindowClassForVehicleType(this->type), VehicleListIdentifier(VL_DEPOT_LIST, this->type, this->owner, this->GetDepotIndex()).Pack(), false);
OrderBackup::Reset(this->window_number); OrderBackup::Reset(this->window_number);
} }
@ -424,10 +424,8 @@ struct DepotWindow : Window {
{ {
if (widget != WID_D_CAPTION) return; if (widget != WID_D_CAPTION) return;
/* locate the depot struct */
TileIndex tile = this->window_number;
SetDParam(0, this->type); SetDParam(0, this->type);
SetDParam(1, (this->type == VEH_AIRCRAFT) ? GetStationIndex(tile) : GetDepotIndex(tile)); SetDParam(1, this->GetDepotIndex());
} }
struct GetDepotVehiclePtData { struct GetDepotVehiclePtData {
@ -810,11 +808,8 @@ struct DepotWindow : Window {
case WID_D_SELL_ALL: case WID_D_SELL_ALL:
/* Only open the confirmation window if there are anything to sell */ /* Only open the confirmation window if there are anything to sell */
if (this->vehicle_list.size() != 0 || this->wagon_list.size() != 0) { if (this->vehicle_list.size() != 0 || this->wagon_list.size() != 0) {
TileIndex tile = this->window_number; SetDParam(0, this->type);
byte vehtype = this->type; SetDParam(1, this->GetDepotIndex());
SetDParam(0, vehtype);
SetDParam(1, (vehtype == VEH_AIRCRAFT) ? GetStationIndex(tile) : GetDepotIndex(tile));
ShowQuery( ShowQuery(
STR_DEPOT_CAPTION, STR_DEPOT_CAPTION,
STR_DEPOT_SELL_CONFIRMATION_TEXT, STR_DEPOT_SELL_CONFIRMATION_TEXT,
@ -840,7 +835,7 @@ struct DepotWindow : Window {
if (str == nullptr) return; if (str == nullptr) return;
/* Do depot renaming */ /* Do depot renaming */
DoCommandP(0, GetDepotIndex(this->window_number), 0, CMD_RENAME_DEPOT | CMD_MSG(STR_ERROR_CAN_T_RENAME_DEPOT), nullptr, str); DoCommandP(0, this->GetDepotIndex(), 0, CMD_RENAME_DEPOT | CMD_MSG(STR_ERROR_CAN_T_RENAME_DEPOT), nullptr, str);
} }
bool OnRightClick(Point pt, int widget) override bool OnRightClick(Point pt, int widget) override
@ -1077,6 +1072,16 @@ struct DepotWindow : Window {
return ES_NOT_HANDLED; return ES_NOT_HANDLED;
} }
/**
* Gets the DepotID of the current window.
* In the case of airports, this is the station ID.
* @return Depot or station ID of this window.
*/
inline uint16 GetDepotIndex() const
{
return (this->type == VEH_AIRCRAFT) ? ::GetStationIndex(this->window_number) : ::GetDepotIndex(this->window_number);
}
}; };
static void DepotSellAllConfirmationCallback(Window *win, bool confirmed) static void DepotSellAllConfirmationCallback(Window *win, bool confirmed)