Mercurial > hg > openttd
changeset 7988:3f046a35100b draft
(svn r11544) -Fix [FS#1501]: revert r11453 as it translated cargo when it should not
author | glx <glx@openttd.org> |
---|---|
date | Sat, 01 Dec 2007 02:47:10 +0000 |
parents | f0c59a2c1705 |
children | 4e0b8188984f |
files | src/newgrf.cpp |
diffstat | 1 files changed, 3 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -1791,7 +1791,7 @@ case 0x0B: case 0x0C: { uint16 acctp = grf_load_word(&buf); - tsp->accepts_cargo[prop - 0x0A] = GB(acctp, 0, 8); + tsp->accepts_cargo[prop - 0x0A] = GetCargoTranslation(GB(acctp, 0, 8), _cur_grffile); tsp->acceptance[prop - 0x0A] = GB(acctp, 8, 8); } break; @@ -1991,13 +1991,13 @@ case 0x10: // Production cargo types for (byte j = 0; j < 2; j++) { - indsp->produced_cargo[j] = grf_load_byte(&buf); + indsp->produced_cargo[j] = GetCargoTranslation(grf_load_byte(&buf), _cur_grffile); } break; case 0x11: // Acceptance cargo types for (byte j = 0; j < 3; j++) { - indsp->accepts_cargo[j] = grf_load_byte(&buf); + indsp->accepts_cargo[j] = GetCargoTranslation(grf_load_byte(&buf), _cur_grffile); } grf_load_byte(&buf); // Unnused, eat it up break; @@ -5327,15 +5327,6 @@ strid = GetGRFStringID(indsp->grf_prop.grffile->grfid, indsp->new_industry_text); if (strid != STR_UNDEFINED) indsp->new_industry_text = strid; - for (byte j = 0; j < 2; j++) { - CargoID c = GetCargoTranslation(indsp->produced_cargo[j], indsp->grf_prop.grffile); - indsp->produced_cargo[j] = c; - } - for (byte j = 0; j < 3; j++) { - CargoID c = GetCargoTranslation(indsp->accepts_cargo[j], indsp->grf_prop.grffile); - indsp->accepts_cargo[j] = c; - } - _industry_mngr.SetEntitySpec(indsp); _loaded_newgrf_features.has_newindustries = true; } @@ -5346,10 +5337,6 @@ for (int i = 0; i < NUM_INDUSTRYTILES; i++) { IndustryTileSpec *indtsp = file->indtspec[i]; if (indtsp != NULL) { - for (byte j = 0; j < 3; j++) { - CargoID c = GetCargoTranslation(indtsp->accepts_cargo[j], indtsp->grf_prop.grffile); - indtsp->accepts_cargo[j] = c; - } _industile_mngr.SetEntitySpec(indtsp); } }