diff options
| author | frosch <frosch@openttd.org> | 2009-02-18 20:40:24 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2009-02-18 20:40:24 +0000 |
| commit | 336fda62bec39eb9ad1ee966a23faa0886a75309 (patch) | |
| tree | b2192b1e198e0ab4398f49ec84b8b3c5feb95f62 /src/newgrf_engine.cpp | |
| parent | 3542b1dced698e6518c2f2bb6e397f316dc1e596 (diff) | |
| download | openttd-336fda62bec39eb9ad1ee966a23faa0886a75309.tar.xz | |
(svn r15517) -Fix [FS#2642](r6455): Wagonoverrides and articulated engine parts use the colour scheme of the engine, but not its recolour callback, nor its 2CC flag. Same applies to roadvehicles.
Diffstat (limited to 'src/newgrf_engine.cpp')
| -rw-r--r-- | src/newgrf_engine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index bda726d92..d05130ee9 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -432,7 +432,9 @@ static uint8 LiveryHelper(EngineID engine, const Vehicle *v) if (!IsValidCompanyID(_current_company)) return 0; l = GetEngineLivery(engine, _current_company, INVALID_ENGINE, NULL); } else if (v->type == VEH_TRAIN) { - l = GetEngineLivery((v->u.rail.first_engine != INVALID_ENGINE && (IsArticulatedPart(v) || UsesWagonOverride(v))) ? v->u.rail.first_engine : v->engine_type, v->owner, v->u.rail.first_engine, v); + l = GetEngineLivery(v->engine_type, v->owner, v->u.rail.first_engine, v); + } else if (v->type == VEH_ROAD) { + l = GetEngineLivery(v->engine_type, v->owner, v->u.road.first_engine, v); } else { l = GetEngineLivery(v->engine_type, v->owner, INVALID_ENGINE, v); } |