From 648c43dde7b7e93af22550c1638f3f352ef79f80 Mon Sep 17 00:00:00 2001 From: bjarni Date: Fri, 29 Sep 2006 17:41:00 +0000 Subject: [PATCH] (svn r6579) -Fix r6552: [depot window] solved a condition where pressing autoreplace in a depot window could result in asserts It still got an issue where it fails to restart moving vehicles after they are replaced though. The cause of this will hopefully be found shortly --- vehicle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vehicle.c b/vehicle.c index 15afae9232..92f3189c5b 100644 --- a/vehicle.c +++ b/vehicle.c @@ -1729,9 +1729,9 @@ int32 CmdDepotMassAutoReplace(TileIndex tile, uint32 flags, uint32 p1, uint32 p2 (vehicle_type == VEH_Ship && !IsShipInDepot(v) ) || (vehicle_type == VEH_Aircraft && !IsAircraftInHangar(v)) ) continue; - if (stopped) v->vehstatus &= ~VS_STOPPED; // Stop the vehicle + if (stopped) v->vehstatus |= VS_STOPPED; // Stop the vehicle ret = MaybeReplaceVehicle(&v, !(flags & DC_EXEC), false); - if (stopped) v->vehstatus |= VS_STOPPED; // restart the vehicle if we stopped it for being replaced + if (stopped) v->vehstatus &= ~VS_STOPPED; // restart the vehicle if we stopped it for being replaced if (!CmdFailed(ret)) { cost += ret;