summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2008-02-15 10:52:10 +0000
committerfrosch <frosch@openttd.org>2008-02-15 10:52:10 +0000
commit4164d2488fdc8fd5d08ae693fbe648eb9fd1ef69 (patch)
tree8c79cd300c55dee14f655fedc6d6f99d1e3d802d /src
parent43c0f7ea8efdd6915b5ca1d311fa1186175b2e52 (diff)
downloadopenttd-4164d2488fdc8fd5d08ae693fbe648eb9fd1ef69.tar.xz
(svn r12142) -Fix [FS#1766]: Callback 0x3D always gets a cargobit in var 0x18, independent of grf version.
Diffstat (limited to 'src')
-rw-r--r--src/newgrf_cargo.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp
index f6548b81d..d43f61019 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)