diff options
author | peter1138 <peter1138@openttd.org> | 2007-02-23 09:56:20 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2007-02-23 09:56:20 +0000 |
commit | 7e73413709b3f830d83338421298af5dc20581db (patch) | |
tree | 2fa52d1955fc03be8152cb9d7b298bfce4b80664 /src/newgrf_engine.cpp | |
parent | 0ed4b64e649349f695a1942e0fa09b8b564e1774 (diff) | |
download | openttd-7e73413709b3f830d83338421298af5dc20581db.tar.xz |
(svn r8858) -Codechange: Replace magic number test with class method for determining if a cargo is valid/active.
Diffstat (limited to 'src/newgrf_engine.cpp')
-rw-r--r-- | src/newgrf_engine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 7e21cc8ec..1d21eb252 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -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); |