petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r11253) -Fix (r9411): industries can still use cargo they define, even if these cargo are disabled by a grf loaded later

Browse Source
This commit is contained in:
glx
2007-10-13 02:49:05 +00:00
parent ac9f287f20
commit f49a52c2ff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf.cpp
View File

@@ -1541,8 +1541,8 @@ static bool CargoChangeInfo(uint cid, int numinfo, int prop, byte **bufp, int le
switch (prop) { switch (prop) {
case 0x08: /* Bit number of cargo */ case 0x08: /* Bit number of cargo */
cs->bitnum = grf_load_byte(&buf); cs->bitnum = grf_load_byte(&buf);
cs->grfid = _cur_grffile->grfid;
if (cs->IsValid()) { if (cs->IsValid()) {
cs->grfid = _cur_grffile->grfid;
SETBIT(_cargo_mask, cid + i); SETBIT(_cargo_mask, cid + i);
} else { } else {
CLRBIT(_cargo_mask, cid + i); CLRBIT(_cargo_mask, cid + i);
@@ -5271,7 +5271,7 @@ static void MapNewCargoStrings()
for (CargoID c = 0; c < NUM_CARGO; c++) { for (CargoID c = 0; c < NUM_CARGO; c++) {
CargoSpec *cs = &_cargo[c]; CargoSpec *cs = &_cargo[c];
/* Don't map if the cargo is unavailable or not from NewGRF */ /* Don't map if the cargo is unavailable or not from NewGRF */
if (!cs->IsValid() || cs->grfid == 0) continue; if (cs->grfid == 0) continue;
cs->name = MapGRFStringID(cs->grfid, cs->name); cs->name = MapGRFStringID(cs->grfid, cs->name);
cs->name_single = MapGRFStringID(cs->grfid, cs->name_single); cs->name_single = MapGRFStringID(cs->grfid, cs->name_single);