mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17442) -Fix [FS#3180]: destruction of depots didn't remove any vehicle lists related to the depot, causing windows pointing to deleted depots and (thus) crashes

release/1.0
rubidium 2009-09-07 08:05:35 +00:00
parent ad70d24634
commit 6593e4490a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/depot.cpp
View File

@ -18,6 +18,7 @@
#include "tile_map.h" #include "tile_map.h"
#include "water_map.h" #include "water_map.h"
#include "core/pool_func.hpp" #include "core/pool_func.hpp"
#include "vehicle_gui.h"
DepotPool _depot_pool("Depot"); DepotPool _depot_pool("Depot");
INSTANTIATE_POOL_METHODS(Depot) INSTANTIATE_POOL_METHODS(Depot)
@ -57,6 +58,15 @@ Depot::~Depot()
/* Delete the depot-window */ /* Delete the depot-window */
DeleteWindowById(WC_VEHICLE_DEPOT, this->xy); DeleteWindowById(WC_VEHICLE_DEPOT, this->xy);
/* Delete the depot list */
WindowNumber wno = (this->index << 16) | VLW_DEPOT_LIST | GetTileOwner(this->xy);
switch (GetTileType(this->xy)) {
default: NOT_REACHED();
case MP_RAILWAY: DeleteWindowById(WC_TRAINS_LIST, wno | (VEH_TRAIN << 11)); break;
case MP_ROAD: DeleteWindowById(WC_ROADVEH_LIST, wno | (VEH_ROAD << 11)); break;
case MP_WATER: DeleteWindowById(WC_SHIPS_LIST, wno | (VEH_SHIP << 11)); break;
}
} }
void InitializeDepots() void InitializeDepots()