From b30a413cfe1a8f832e41fffd6ece640ccea2cdb1 Mon Sep 17 00:00:00 2001 From: hackykid Date: Sun, 5 Jun 2005 05:35:12 +0000 Subject: [PATCH] (svn r2410) - Fix: [newgrf] When resolving callbacks, dont ignore wagon overrides. --- engine.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/engine.c b/engine.c index e1a1399838..0265f2116c 100644 --- a/engine.c +++ b/engine.c @@ -606,6 +606,13 @@ uint16 GetCallBackResult(uint16 callback_info, byte engine, const Vehicle *v) cargo = _global_cargo_id[_opt.landscape][v->cargo_type]; group = &_engine_custom_sprites[engine][cargo]; + + if (v != NULL && v->type == VEH_Train) { + SpriteGroup *overset = GetWagonOverrideSpriteSet(engine, v->u.rail.first_engine); + + if (overset != NULL) group = overset; + } + group = ResolveVehicleSpriteGroup(group, v, callback_info, (resolve_callback) ResolveVehicleSpriteGroup); if (group->type == SGT_REAL && group->g.real.sprites_per_set == 0 && cargo != GC_DEFAULT) {