From 07c34b2628b821e03fa3b996508897a763469107 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Wed, 6 Jun 2007 10:51:11 +0000
Subject: [PATCH] (svn r10048) -Fix (r6455): Don't use override engine type for
 articulated wagon parts.

---
 src/vehicle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index d6c46e5e50..daae5c0c9c 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2595,7 +2595,7 @@ SpriteID GetVehiclePalette(const Vehicle *v)
 {
 	if (v->type == VEH_TRAIN) {
 		return GetEngineColourMap(
-			(v->u.rail.first_engine != INVALID_ENGINE && (IsArticulatedPart(v) || UsesWagonOverride(v))) ?
+			(v->u.rail.first_engine != INVALID_ENGINE && (UsesWagonOverride(v) || (IsArticulatedPart(v) && RailVehInfo(v->engine_type)->railveh_type != RAILVEH_WAGON))) ?
 				v->u.rail.first_engine : v->engine_type,
 			v->owner, v->u.rail.first_engine, v);
 	}