diff options
author | pasky <pasky@openttd.org> | 2005-03-25 16:07:35 +0000 |
---|---|---|
committer | pasky <pasky@openttd.org> | 2005-03-25 16:07:35 +0000 |
commit | 339785dad7a0858fe04a5db6826d5f6b7eca2323 (patch) | |
tree | 3db50589bce208b9cd3695d30925622d0f15dd70 /engine.c | |
parent | 7fceb7ea86f8e0de40abc18cf94aee3917b7696d (diff) | |
download | openttd-339785dad7a0858fe04a5db6826d5f6b7eca2323.tar.xz |
(svn r2064) - Codechange: GetVehicleSpriteGroup() cleanup - drop overriding_engine, which was around probably only for historical reasons. (Paralellily developed by HackyKid.)
Diffstat (limited to 'engine.c')
-rw-r--r-- | engine.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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; } |