Mercurial > hg > openttd
changeset 18052:ef00ecdc853c draft
(svn r22867) -Fix (r12122): Variables 40 and 81 of callback 18 are not the same as 80.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Thu, 01 Sep 2011 19:43:37 +0000 |
| parents | 870d93502d37 |
| children | f8d3b568aef2 |
| files | src/newgrf_generic.cpp |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_generic.cpp +++ b/src/newgrf_generic.cpp @@ -85,10 +85,10 @@ static uint32 GenericCallbackGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available) { switch (variable) { - case 0x40: return object->u.generic.cargo_type; + case 0x40: return object->grffile->cargo_map[object->u.generic.cargo_type]; case 0x80: return object->u.generic.cargo_type; - case 0x81: return object->u.generic.cargo_type; + case 0x81: return CargoSpec::Get(object->u.generic.cargo_type)->bitnum; case 0x82: return object->u.generic.default_selection; case 0x83: return object->u.generic.src_industry; case 0x84: return object->u.generic.dst_industry;