(svn r10048) -Fix (r6455): Don't use override engine type for articulated wagon parts.

18 years ago · 07c34b2628
parent 4ffe147bd4
commit 07c34b2628
1 changed files with 1 additions and 1 deletions
--- 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);
 	}