# HG changeset patch # User Darkvater # Date 1146574329 0 # Node ID 9dbe560017f99cd3b2a37445048dd0a6b25f8707 # Parent 8f4c831cc43375de0733501f4cdec699e76ecf46 (svn r4664) - Backport from trunk (r4228): Fix: [autoreplace] allow replacement of wagons even when the engine fails to be replaced diff -r 8f4c831cc433 -r 9dbe560017f9 vehicle.c --- a/vehicle.c Tue May 02 12:47:51 2006 +0000 +++ b/vehicle.c Tue May 02 12:52:09 2006 +0000 @@ -1765,12 +1765,10 @@ v = w; } - if (CmdFailed(temp_cost)) break; - - cost += temp_cost; + if (!CmdFailed(temp_cost)) cost += temp_cost; } while (w->type == VEH_Train && (w = GetNextVehicle(w)) != NULL); - if (!(flags & DC_EXEC) && (CmdFailed(temp_cost) || p->money64 < (int32)(cost + p->engine_renew_money) || cost == 0)) { + if (p->money64 < (int32)(cost + p->engine_renew_money) || cost == 0) { if (p->money64 < (int32)(cost + p->engine_renew_money) && ( _local_player == v->owner ) && cost != 0) { StringID message; SetDParam(0, v->unitnumber);