dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r24273) -Fix: [NewGRF] GetReverseCargoTranslation() was unnecessary complicated and also returned the wrong thing for cargos not present in the translation table.

Browse Source
This commit is contained in:
frosch
2012-05-25 17:23:19 +00:00
parent 9522dbb1a9
commit 5a34b744b1
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/newgrf_cargo.cpp
View File

@@ -126,18 +126,3 @@ CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile, bool usebit)
}
return CT_INVALID;
}
uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile)
{
/* Note: All grf versions use CargoBit here. Pre-version 7 do NOT use the 'climate dependent' ID. */
const CargoSpec *cs = CargoSpec::Get(cargo);
/* If the GRF contains a translation table (and the cargo is in the table)
* then get the cargo ID for the label */
for (uint i = 0; i < grffile->cargo_max; i++) {
if (cs->label == grffile->cargo_list[i]) return i;
}
/* No matching label was found, so we return the 'climate independent' 'bitnum' */
return cs->bitnum;
}