From 7d4d13df3519d6db4b324b132c32325d25f7f5c3 Mon Sep 17 00:00:00 2001 From: bjarni Date: Fri, 4 Nov 2005 22:10:49 +0000 Subject: (svn r3137) -Fix: [autoreplace] fixed assert that was triggerable when a vehicle entered a depot even though the goto depot was canceled this assert could be reached by clicking on the goto depot button to cancel goto depot from the orders and the vehicle still entered the depot. The flags in that case would not be "normal" anymore. An additional check is added to prevent this --- vehicle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vehicle.c b/vehicle.c index ae21c5b19..b88811bdf 100644 --- a/vehicle.c +++ b/vehicle.c @@ -527,7 +527,7 @@ Vehicle *_first_veh_in_depot_list; void VehicleEnteredDepotThisTick(Vehicle *v) { // we need to set v->leave_depot_instantly as we have no control of it's contents at this time - if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) { + if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS) && v->current_order.type == OT_GOTO_DEPOT) { // we keep the vehicle in the depot since the user ordered it to stay v->leave_depot_instantly = false; } else { -- cgit v1.2.3-70-g09d2