--- a/src/newgrf.cpp	Sat Feb 24 22:35:42 2007 +0000
+++ b/src/newgrf.cpp	Sat Feb 24 23:20:21 2007 +0000
@@ -3707,6 +3707,29 @@
 	_cur_grffile->spritegroups_count = 0;
 }
 
+static void BuildCargoTranslationMap()
+{
+	memset(_cur_grffile->cargo_map, 0xFF, sizeof(_cur_grffile->cargo_map));
+
+	for (CargoID c = 0; c < NUM_CARGO; c++) {
+		const CargoSpec *cs = GetCargo(c);
+		if (!cs->IsValid()) continue;
+
+		if (_cur_grffile->cargo_max == 0) {
+			/* Default translation table, so just a straight mapping to bitnum */
+			_cur_grffile->cargo_map[c] = cs->bitnum;
+		} else {
+			/* Check the translation table for this cargo's label */
+			for (uint i = 0; i < _cur_grffile->cargo_max; i++) {
+				if (cs->label == _cur_grffile->cargo_list[i]) {
+					_cur_grffile->cargo_map[c] = i;
+					break;
+				}
+			}
+		}
+	}
+}
+
 static void InitNewGRFFile(const GRFConfig *config, int sprite_offset)
 {
 	GRFFile *newfile;
@@ -4032,6 +4055,7 @@
 			LoadNewGRFFile(c, slot++, stage);
 			if (stage == GLS_ACTIVATION) {
 				ClearTemporaryNewGRFData();
+				BuildCargoTranslationMap();
 				DEBUG(sprite, 2, "Currently %i sprites are loaded", _cur_spriteid);
 			}
 		}

--- a/src/newgrf.h	Sat Feb 24 22:35:42 2007 +0000
+++ b/src/newgrf.h	Sat Feb 24 23:20:21 2007 +0000
@@ -64,6 +64,7 @@
 
 	uint8 cargo_max;
 	CargoLabel *cargo_list;
+	uint8 cargo_map[NUM_CARGO];
 } GRFFile;
 
 extern GRFFile *_first_grffile;

--- a/src/newgrf_engine.cpp	Sat Feb 24 22:35:42 2007 +0000
+++ b/src/newgrf_engine.cpp	Sat Feb 24 23:20:21 2007 +0000
@@ -608,7 +608,7 @@
 			 */
 			const CargoSpec *cs = GetCargo(v->cargo_type);
 
-			return (cs->classes << 16) | (cs->weight << 8) | cs->bitnum;
+			return (cs->classes << 16) | (cs->weight << 8) | GetEngineGRF(v->engine_type)->cargo_map[v->cargo_type];
 		}
 
 		case 0x48: return GetVehicleTypeInfo(v->engine_type); /* Vehicle Type Info */