# HG changeset patch
# User frosch
# Date 1203072730 0
# Node ID 3bc3c707719b16d176bbd1e023064991f6bf901d
# Parent  04edde3eb0c6997928fe2e1a0d72af55148db927
(svn r12142) -Fix [FS#1766]: Callback 0x3D always gets a cargobit in var 0x18, independent of grf version.

diff -r 04edde3eb0c6 -r 3bc3c707719b src/newgrf_cargo.cpp
--- a/src/newgrf_cargo.cpp	Thu Feb 14 15:59:16 2008 +0000
+++ b/src/newgrf_cargo.cpp	Fri Feb 15 10:52:10 2008 +0000
@@ -115,9 +115,7 @@
 
 uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile)
 {
-	/* Pre-version 7 uses the 'climate dependent' ID, i.e. cargo is the cargo ID */
-	if (grffile->grf_version < 7) return cargo;
-
+	/* Note: All grf versions use CargoBit here. Pre-version 7 do NOT use the 'climate dependent' ID. */
 	const CargoSpec *cs = GetCargo(cargo);
 
 	/* If the GRF contains a translation table (and the cargo is in the table)