mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11252) -Revert r11239, Fix r9620: cargo translation was not done correctly

release/0.6
glx 2007-10-13 02:23:11 +00:00
parent 63f54c43b3
commit ac9f287f20
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/newgrf.cpp
View File

@ -1762,7 +1762,7 @@ static bool IndustrytilesChangeInfo(uint indtid, int numinfo, int prop, byte **b
case 0x0B: case 0x0B:
case 0x0C: { case 0x0C: {
uint16 acctp = grf_load_word(&buf); 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); tsp->acceptance[prop - 0x0A] = GB(acctp, 8, 8);
} break; } break;
@ -1963,13 +1963,13 @@ static bool IndustriesChangeInfo(uint indid, int numinfo, int prop, byte **bufp,
case 0x10: // Production cargo types case 0x10: // Production cargo types
for (byte j = 0; j < 2; j++) { 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; break;
case 0x11: // Acceptance cargo types case 0x11: // Acceptance cargo types
for (byte j = 0; j < 3; j++) { 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 grf_load_byte(&buf); // Unnused, eat it up
break; break;
@ -5237,15 +5237,6 @@ static void FinaliseIndustriesArray()
strid = GetGRFStringID(indsp->grf_prop.grffile->grfid, indsp->new_industry_text); strid = GetGRFStringID(indsp->grf_prop.grffile->grfid, indsp->new_industry_text);
if (strid != STR_UNDEFINED) indsp->new_industry_text = strid; 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); _industry_mngr.SetEntitySpec(indsp);
_loaded_newgrf_features.has_newindustries = true; _loaded_newgrf_features.has_newindustries = true;
} }
@ -5256,10 +5247,6 @@ static void FinaliseIndustriesArray()
for (int i = 0; i < NUM_INDUSTRYTILES; i++) { for (int i = 0; i < NUM_INDUSTRYTILES; i++) {
IndustryTileSpec *indtsp = file->indtspec[i]; IndustryTileSpec *indtsp = file->indtspec[i];
if (indtsp != NULL) { 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); _industile_mngr.SetEntitySpec(indtsp);
} }
} }

20
src/newgrf_cargo.cpp
View File

@ -98,17 +98,19 @@ uint16 GetCargoCallback(CallbackID callback, uint32 param1, uint32 param2, const
} }
CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile) CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile, bool usebit)
{ {
/* Pre-version 7 uses the 'climate dependent' ID, i.e. cargo is the cargo ID */ /* Pre-version 7 uses the 'climate dependent' ID, i.e. cargo is the cargo ID */
if (grffile->grf_version < 7) return HASBIT(_cargo_mask, cargo) ? cargo : (CargoID) CT_INVALID; if (grffile->grf_version < 7) {
if (!usebit) return cargo;
/* If the GRF contains a translation table (and the cargo is in bounds) /* Else the cargo value is a 'climate independent' 'bitnum' */
* then get the cargo ID for the label */ if (HASBIT(_cargo_mask, cargo)) return GetCargoIDByBitnum(cargo);
if (cargo < grffile->cargo_max) return GetCargoIDByLabel(grffile->cargo_list[cargo]); } else {
/* If the GRF contains a translation table (and the cargo is in bounds)
/* Else the cargo value is a 'climate independent' 'bitnum' */ * then get the cargo ID for the label */
return GetCargoIDByBitnum(cargo); if (cargo < grffile->cargo_max) return GetCargoIDByLabel(grffile->cargo_list[cargo]);
}
return CT_INVALID;
} }
uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile) uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile)

2
src/newgrf_cargo.h
View File

@ -29,7 +29,7 @@ struct GRFFile;
SpriteID GetCustomCargoSprite(const CargoSpec *cs); SpriteID GetCustomCargoSprite(const CargoSpec *cs);
uint16 GetCargoCallback(CallbackID callback, uint32 param1, uint32 param2, const CargoSpec *cs); uint16 GetCargoCallback(CallbackID callback, uint32 param1, uint32 param2, const CargoSpec *cs);
CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile); CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile, bool usebit = false);
uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile); uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile);
#endif /* NEWGRF_CARGO_H */ #endif /* NEWGRF_CARGO_H */