(svn r8858) -Codechange: Replace magic number test with class method for determining if a cargo is valid/active.

This commit is contained in:
peter1138
2007-02-23 09:56:20 +00:00
parent 0ed4b64e64
commit 7e73413709
5 changed files with 15 additions and 5 deletions

View File

@@ -820,8 +820,10 @@ static const SpriteGroup *GetVehicleSpriteGroup(EngineID engine, const Vehicle *
if (v == NULL) {
cargo = GC_PURCHASE;
} else {
cargo = GetCargo(v->cargo_type)->bitnum;
assert(cargo != GC_INVALID);
const CargoSpec *cs = GetCargo(v->cargo_type);
assert(cs->IsValid());
cargo = cs->bitnum;
if (v->type == VEH_Train) {
group = GetWagonOverrideSpriteSet(engine, cargo, v->u.rail.first_engine);