diff options
| author | frosch <frosch@openttd.org> | 2008-02-15 10:52:10 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-02-15 10:52:10 +0000 |
| commit | 7c528a6ab7d57c11ef0bac88ee426ce541bab8db (patch) | |
| tree | 8c79cd300c55dee14f655fedc6d6f99d1e3d802d | |
| parent | 514df81e27398309532f7523ee1c7df86fe3043d (diff) | |
| download | openttd-7c528a6ab7d57c11ef0bac88ee426ce541bab8db.tar.xz | |
(svn r12142) -Fix [FS#1766]: Callback 0x3D always gets a cargobit in var 0x18, independent of grf version.
| -rw-r--r-- | src/newgrf_cargo.cpp | 4 |
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) |