equal
deleted
inserted
replaced
1530 CLRBIT(_cargo_mask, cid + i); |
1530 CLRBIT(_cargo_mask, cid + i); |
1531 } |
1531 } |
1532 break; |
1532 break; |
1533 |
1533 |
1534 case 0x09: /* String ID for cargo type name */ |
1534 case 0x09: /* String ID for cargo type name */ |
1535 cs->name_plural = grf_load_word(&buf); |
1535 cs->name = grf_load_word(&buf); |
1536 break; |
1536 break; |
1537 |
1537 |
1538 case 0x0A: /* String for 1 unit of cargo */ |
1538 case 0x0A: /* String for 1 unit of cargo */ |
1539 cs->name = grf_load_word(&buf); |
1539 cs->name_single = grf_load_word(&buf); |
1540 break; |
1540 break; |
1541 |
1541 |
1542 case 0x0B: |
1542 case 0x0B: |
1543 /* String for units of cargo. This is different in OpenTTD to TTDPatch |
1543 /* String for units of cargo. This is different in OpenTTD to TTDPatch |
1544 * (e.g. 10 tonnes of coal) */ |
1544 * (e.g. 10 tonnes of coal) */ |
5257 CargoSpec *cs = &_cargo[c]; |
5257 CargoSpec *cs = &_cargo[c]; |
5258 /* Don't map if the cargo is unavailable or not from NewGRF */ |
5258 /* Don't map if the cargo is unavailable or not from NewGRF */ |
5259 if (!cs->IsValid() || cs->grfid == 0) continue; |
5259 if (!cs->IsValid() || cs->grfid == 0) continue; |
5260 |
5260 |
5261 cs->name = MapGRFStringID(cs->grfid, cs->name); |
5261 cs->name = MapGRFStringID(cs->grfid, cs->name); |
5262 cs->name_plural = MapGRFStringID(cs->grfid, cs->name_plural); |
5262 cs->name_single = MapGRFStringID(cs->grfid, cs->name_single); |
5263 cs->units_volume = MapGRFStringID(cs->grfid, cs->units_volume); |
5263 cs->units_volume = MapGRFStringID(cs->grfid, cs->units_volume); |
5264 cs->quantifier = MapGRFStringID(cs->grfid, cs->quantifier); |
5264 cs->quantifier = MapGRFStringID(cs->grfid, cs->quantifier); |
5265 cs->abbrev = MapGRFStringID(cs->grfid, cs->abbrev); |
5265 cs->abbrev = MapGRFStringID(cs->grfid, cs->abbrev); |
5266 } |
5266 } |
5267 } |
5267 } |