From 4164d2488fdc8fd5d08ae693fbe648eb9fd1ef69 Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 15 Feb 2008 10:52:10 +0000 Subject: [PATCH] (svn r12142) -Fix [FS#1766]: Callback 0x3D always gets a cargobit in var 0x18, independent of grf version. --- src/newgrf_cargo.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp index f6548b81dc..d43f61019c 100644 --- a/src/newgrf_cargo.cpp +++ b/src/newgrf_cargo.cpp @@ -115,9 +115,7 @@ CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile, bool usebit) 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)