From f5128695c54ad634e1ac45ae4271c1db5ed15fad Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 8 Sep 2010 21:37:13 +0000 Subject: (svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers --- src/depot_cmd.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/depot_cmd.cpp') diff --git a/src/depot_cmd.cpp b/src/depot_cmd.cpp index bf4d0201c..2c507f73f 100644 --- a/src/depot_cmd.cpp +++ b/src/depot_cmd.cpp @@ -16,6 +16,7 @@ #include "string_func.h" #include "town.h" #include "vehicle_gui.h" +#include "vehiclelist.h" #include "window_func.h" #include "table/strings.h" @@ -71,13 +72,14 @@ CommandCost CmdRenameDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 SetWindowDirty(WC_VEHICLE_DEPOT, d->xy); /* Update the depot list */ - WindowNumber wno = (d->index << 16) | VLW_DEPOT_LIST | GetTileOwner(d->xy); + VehicleType vt; switch (GetTileType(d->xy)) { - default: break; - case MP_RAILWAY: SetWindowDirty(WC_TRAINS_LIST, wno | (VEH_TRAIN << 11)); break; - case MP_ROAD: SetWindowDirty(WC_ROADVEH_LIST, wno | (VEH_ROAD << 11)); break; - case MP_WATER: SetWindowDirty(WC_SHIPS_LIST, wno | (VEH_SHIP << 11)); break; + default: NOT_REACHED(); + case MP_RAILWAY: vt = VEH_TRAIN; break; + case MP_ROAD: vt = VEH_ROAD; break; + case MP_WATER: vt = VEH_SHIP; break; } + SetWindowDirty(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_DEPOT_LIST, vt, GetTileOwner(d->xy), d->index).Pack()); } return CommandCost(); } -- cgit v1.2.3-54-g00ecf