From c9765caf6ae71a6ead2695258842d13ea8d205b8 Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 1 Sep 2011 19:43:37 +0000 Subject: (svn r22867) -Fix (r12122): Variables 40 and 81 of callback 18 are not the same as 80. --- src/newgrf_generic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp index 90a11f8fb..abf2461dd 100644 --- a/src/newgrf_generic.cpp +++ b/src/newgrf_generic.cpp @@ -85,10 +85,10 @@ static void GenericCallbackSetTriggers(const ResolverObject *object, int trigger 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; -- cgit v1.2.3-54-g00ecf