# HG changeset patch
# User frosch <frosch@openttd.org>
# Date 1314906217 0
# Node ID ef00ecdc853cc49701dc1d57bba618489316077e
# Parent  870d93502d370e869471911cc2757c88e530a5ea
(svn r22867) -Fix (r12122): Variables 40 and 81 of callback 18 are not the same as 80.

diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp
--- 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;