From 7fd164deba714c9485b31343681cb3dea0dae5e7 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Fri, 16 Jun 2006 18:59:26 +0000 Subject: [PATCH] (svn r5289) - Backport from trunk (r5175, r5176): Autoreplaced trains can leave all wagons in depot under certain circumstances --- train_cmd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/train_cmd.c b/train_cmd.c index 60acf55b65..7b40072005 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -819,8 +819,10 @@ int CheckTrainStoppedInDepot(const Vehicle *v) for (; v != NULL; v = v->next) { /* This count is used by the depot code to determine the number of engines * in the consist. Exclude articulated parts so that autoreplacing to - * engines with more articulated parts that before works correctly. */ - if (!IsArticulatedPart(v)) count++; + * engines with more articulated parts than before works correctly. + * + * Also skip counting rear ends of multiheaded engines */ + if (!IsArticulatedPart(v) && !(!IsTrainEngine(v) && IsMultiheaded(v))) count++; if (v->u.rail.track != 0x80 || v->tile != tile || (IsFrontEngine(v) && !(v->vehstatus & VS_STOPPED))) { _error_message = STR_881A_TRAINS_CAN_ONLY_BE_ALTERED;