diff options
| author | peter1138 <peter1138@openttd.org> | 2007-05-20 09:17:42 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2007-05-20 09:17:42 +0000 |
| commit | c28cffdf672fdf47bf89936c8e4ddc1b20f52d32 (patch) | |
| tree | 562dbef75052d1b7e5c5635c813896dbc7f68ea5 /src/newgrf_cargo.cpp | |
| parent | 44fc08391d5505ba991f5359eab469be24c5e500 (diff) | |
| download | openttd-c28cffdf672fdf47bf89936c8e4ddc1b20f52d32.tar.xz | |
(svn r9888) -Codechange: [NewGRF] allow non-spec cargo action2s to work, and using the goods sprite if really nothing is returned.
Diffstat (limited to 'src/newgrf_cargo.cpp')
| -rw-r--r-- | src/newgrf_cargo.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp index 788e2fbe5..6724edb53 100644 --- a/src/newgrf_cargo.cpp +++ b/src/newgrf_cargo.cpp @@ -39,10 +39,12 @@ static uint32 CargoGetVariable(const ResolverObject *object, byte variable, byte static const SpriteGroup *CargoResolveReal(const ResolverObject *object, const SpriteGroup *group) { - /* Cargo action 2s should always have only 1 "loaded" state */ - if (group->g.real.num_loaded == 0) return NULL; + /* Cargo action 2s should always have only 1 "loaded" state, but some + * times things don't follow the spec... */ + if (group->g.real.num_loaded > 0) return group->g.real.loaded[0]; + if (group->g.real.num_loading > 0) return group->g.real.loading[0]; - return group->g.real.loaded[0]; + return NULL; } |