dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r2064) - Codechange: GetVehicleSpriteGroup() cleanup - drop overriding_engine, which was around probably only for historical reasons. (Paralellily developed by HackyKid.)

Browse Source
This commit is contained in:
pasky
2005-03-25 16:07:35 +00:00
parent 7fceb7ea86
commit 339785dad7
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine.c
View File

@@ -462,18 +462,16 @@ static RealSpriteGroup* ResolveVehicleSpriteGroup(SpriteGroup *spritegroup,
static SpriteGroup *GetVehicleSpriteGroup(byte engine, const Vehicle *v) static SpriteGroup *GetVehicleSpriteGroup(byte engine, const Vehicle *v)
{ {
SpriteGroup *group; SpriteGroup *group;
uint16 overriding_engine = -1;
byte cargo = CID_PURCHASE; byte cargo = CID_PURCHASE;
if (v != NULL) { if (v != NULL) {
overriding_engine = v->type == VEH_Train ? v->u.rail.first_engine : -1;
cargo = _global_cargo_id[_opt.landscape][v->cargo_type]; cargo = _global_cargo_id[_opt.landscape][v->cargo_type];
} }
group = &_engine_custom_sprites[engine][cargo]; group = &_engine_custom_sprites[engine][cargo];
if (overriding_engine != 0xffff) { if (v != NULL && v->type == VEH_Train) {
SpriteGroup *overset = GetWagonOverrideSpriteSet(engine, overriding_engine); SpriteGroup *overset = GetWagonOverrideSpriteSet(engine, v->u.rail.first_engine);
if (overset != NULL) group = overset; if (overset != NULL) group = overset;
} }