From 339785dad7a0858fe04a5db6826d5f6b7eca2323 Mon Sep 17 00:00:00 2001 From: pasky Date: Fri, 25 Mar 2005 16:07:35 +0000 Subject: [PATCH] (svn r2064) - Codechange: GetVehicleSpriteGroup() cleanup - drop overriding_engine, which was around probably only for historical reasons. (Paralellily developed by HackyKid.) --- engine.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/engine.c b/engine.c index 4083408da1..4563353d2c 100644 --- a/engine.c +++ b/engine.c @@ -462,18 +462,16 @@ static RealSpriteGroup* ResolveVehicleSpriteGroup(SpriteGroup *spritegroup, static SpriteGroup *GetVehicleSpriteGroup(byte engine, const Vehicle *v) { SpriteGroup *group; - uint16 overriding_engine = -1; byte cargo = CID_PURCHASE; if (v != NULL) { - overriding_engine = v->type == VEH_Train ? v->u.rail.first_engine : -1; cargo = _global_cargo_id[_opt.landscape][v->cargo_type]; } group = &_engine_custom_sprites[engine][cargo]; - if (overriding_engine != 0xffff) { - SpriteGroup *overset = GetWagonOverrideSpriteSet(engine, overriding_engine); + if (v != NULL && v->type == VEH_Train) { + SpriteGroup *overset = GetWagonOverrideSpriteSet(engine, v->u.rail.first_engine); if (overset != NULL) group = overset; }