summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-12-01 02:47:10 +0000
committerglx <glx@openttd.org>2007-12-01 02:47:10 +0000
commitda9f06252b3e7c668c0e4ac2130cb0ad92aba8f3 (patch)
tree2388f381938b965dba38fb5942d4ae8d4886f140
parentaa0d37854deb7e7fa93d63e449ad478b7c452344 (diff)
downloadopenttd-da9f06252b3e7c668c0e4ac2130cb0ad92aba8f3.tar.xz
(svn r11544) -Fix [FS#1501]: revert r11453 as it translated cargo when it should not
-rw-r--r--src/newgrf.cpp19
1 files changed, 3 insertions, 16 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 5f8889db5..34b13b12b 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1791,7 +1791,7 @@ static bool IndustrytilesChangeInfo(uint indtid, int numinfo, int prop, byte **b
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 @@ static bool IndustriesChangeInfo(uint indid, int numinfo, int prop, byte **bufp,
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 @@ static void FinaliseIndustriesArray()
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 @@ static void FinaliseIndustriesArray()
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);
}
}