# HG changeset patch # User pasky # Date 1111766855 0 # Node ID 50acca78ff8dd309b53561e86293559014211523 # Parent 616d0c6c5f3d9edebf151eafb9702a6254f7eefa (svn r2064) - Codechange: GetVehicleSpriteGroup() cleanup - drop overriding_engine, which was around probably only for historical reasons. (Paralellily developed by HackyKid.) diff -r 616d0c6c5f3d -r 50acca78ff8d engine.c --- a/engine.c Fri Mar 25 15:31:01 2005 +0000 +++ b/engine.c Fri Mar 25 16:07:35 2005 +0000 @@ -462,18 +462,16 @@ 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; }