(svn r7386) -Codechange r7385: moved deletion of the vehicle highlight from DeleteVehicle to the sell commands as they are not called as often
Also added a return to the window loop prevent looking at the rest of the windows once the right depot window is found
--- a/aircraft_cmd.c Tue Dec 05 22:40:42 2006 +0000
+++ b/aircraft_cmd.c Tue Dec 05 22:59:42 2006 +0000
@@ -417,6 +417,7 @@
DeleteWindowById(WC_VEHICLE_VIEW, v->index);
RebuildVehicleLists();
InvalidateWindow(WC_COMPANY, v->owner);
+ DeleteDepotHighlightOfVehicle(v);
DeleteVehicleChain(v);
InvalidateWindowClasses(WC_AIRCRAFT_LIST);
}
--- a/depot_gui.c Tue Dec 05 22:40:42 2006 +0000
+++ b/depot_gui.c Tue Dec 05 22:59:42 2006 +0000
@@ -1049,5 +1049,6 @@
WP(w, depot_d).sel = INVALID_VEHICLE;
ResetObjectToPlace();
}
+ return;
}
}
--- a/roadveh_cmd.c Tue Dec 05 22:40:42 2006 +0000
+++ b/roadveh_cmd.c Tue Dec 05 22:59:42 2006 +0000
@@ -283,6 +283,7 @@
InvalidateWindow(WC_COMPANY, v->owner);
DeleteWindowById(WC_VEHICLE_VIEW, v->index);
ClearSlot(v);
+ DeleteDepotHighlightOfVehicle(v);
DeleteVehicle(v);
if (IsLocalPlayer()) InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road);
}
--- a/ship_cmd.c Tue Dec 05 22:40:42 2006 +0000
+++ b/ship_cmd.c Tue Dec 05 22:59:42 2006 +0000
@@ -920,6 +920,7 @@
RebuildVehicleLists();
InvalidateWindow(WC_COMPANY, v->owner);
DeleteWindowById(WC_VEHICLE_VIEW, v->index);
+ DeleteDepotHighlightOfVehicle(v);
DeleteVehicle(v);
if (IsLocalPlayer())
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window
--- a/train_cmd.c Tue Dec 05 22:40:42 2006 +0000
+++ b/train_cmd.c Tue Dec 05 22:59:42 2006 +0000
@@ -1373,6 +1373,7 @@
cost -= rear->value;
if (flags & DC_EXEC) {
UnlinkWagon(rear, first);
+ DeleteDepotHighlightOfVehicle(rear);
DeleteVehicle(rear);
}
}
@@ -1417,6 +1418,7 @@
cost -= v->value;
if (flags & DC_EXEC) {
first = UnlinkWagon(v, first);
+ DeleteDepotHighlightOfVehicle(v);
DeleteVehicle(v);
/* 4 If the second wagon was an engine, update it to front_engine
@@ -1463,6 +1465,7 @@
cost -= rear->value;
if (flags & DC_EXEC) {
first = UnlinkWagon(rear, first);
+ DeleteDepotHighlightOfVehicle(rear);
DeleteVehicle(rear);
}
}
@@ -1475,6 +1478,7 @@
cost -= v->value;
if (flags & DC_EXEC) {
first = UnlinkWagon(v, first);
+ DeleteDepotHighlightOfVehicle(v);
DeleteVehicle(v);
}
}
--- a/vehicle.c Tue Dec 05 22:40:42 2006 +0000
+++ b/vehicle.c Tue Dec 05 22:59:42 2006 +0000
@@ -566,8 +566,6 @@
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
}
- DeleteDepotHighlightOfVehicle(v);
-
UpdateVehiclePosHash(v, INVALID_COORD, 0);
v->next_hash = INVALID_VEHICLE;
if (v->orders != NULL) DeleteVehicleOrders(v);