(svn r4228) -Fix: [autoreplace] allow replacement of wagons even when the engine fails to be replaced

This commit is contained in:
bjarni 2006-04-01 15:11:30 +00:00
parent 96288ee39a
commit 7c64aa4142
1 changed files with 4 additions and 4 deletions

View File

@ -1781,12 +1781,12 @@ static void MaybeReplaceVehicle(Vehicle *v)
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);