Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23144) -Change: [NewGRF v8] Consider the 'default cargotype' properties as indices into the cargo translation table.

Browse Source
This commit is contained in:
frosch 2011-11-08 17:25:42 +00:00
parent 449d679230
commit 48f75a6a8d
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/newgrf.cpp
View File

@ -1004,11 +1004,15 @@ static ChangeInfoResult RailVehicleChangeInfo(uint engine, int numinfo, int prop
case 0x15: { // Cargo type case 0x15: { // Cargo type
uint8 ctype = buf->ReadByte(); uint8 ctype = buf->ReadByte();
if (ctype < NUM_CARGO && HasBit(_cargo_mask, ctype)) { if (ctype == 0xFF) {
ei->cargo_type = ctype;
} else if (ctype == 0xFF) {
/* 0xFF is specified as 'use first refittable' */ /* 0xFF is specified as 'use first refittable' */
ei->cargo_type = CT_INVALID; ei->cargo_type = CT_INVALID;
} else if (_cur.grffile->grf_version >= 8) {
/* Use translated cargo. Might result in CT_INVALID (first refittable), if cargo is not defined. */
ei->cargo_type = GetCargoTranslation(ctype, _cur.grffile);
} else if (ctype < NUM_CARGO && HasBit(_cargo_mask, ctype)) {
/* Use untranslated cargo. */
ei->cargo_type = ctype;
} else { } else {
ei->cargo_type = CT_INVALID; ei->cargo_type = CT_INVALID;
grfmsg(2, "RailVehicleChangeInfo: Invalid cargo type %d, using first refittable", ctype); grfmsg(2, "RailVehicleChangeInfo: Invalid cargo type %d, using first refittable", ctype);
@ -1214,15 +1218,20 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint engine, int numinfo, int prop
break; break;
case 0x10: { // Cargo type case 0x10: { // Cargo type
uint8 cargo = buf->ReadByte(); uint8 ctype = buf->ReadByte();
if (cargo < NUM_CARGO && HasBit(_cargo_mask, cargo)) { if (ctype == 0xFF) {
ei->cargo_type = cargo; /* 0xFF is specified as 'use first refittable' */
} else if (cargo == 0xFF) {
ei->cargo_type = CT_INVALID; ei->cargo_type = CT_INVALID;
} else if (_cur.grffile->grf_version >= 8) {
/* Use translated cargo. Might result in CT_INVALID (first refittable), if cargo is not defined. */
ei->cargo_type = GetCargoTranslation(ctype, _cur.grffile);
} else if (ctype < NUM_CARGO && HasBit(_cargo_mask, ctype)) {
/* Use untranslated cargo. */
ei->cargo_type = ctype;
} else { } else {
ei->cargo_type = CT_INVALID; ei->cargo_type = CT_INVALID;
grfmsg(2, "RoadVehicleChangeInfo: Invalid cargo type %d, using first refittable", cargo); grfmsg(2, "RailVehicleChangeInfo: Invalid cargo type %d, using first refittable", ctype);
} }
break; break;
} }
@ -1364,15 +1373,20 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint engine, int numinfo, int prop
break; break;
case 0x0C: { // Cargo type case 0x0C: { // Cargo type
uint8 cargo = buf->ReadByte(); uint8 ctype = buf->ReadByte();
if (cargo < NUM_CARGO && HasBit(_cargo_mask, cargo)) { if (ctype == 0xFF) {
ei->cargo_type = cargo; /* 0xFF is specified as 'use first refittable' */
} else if (cargo == 0xFF) {
ei->cargo_type = CT_INVALID; ei->cargo_type = CT_INVALID;
} else if (_cur.grffile->grf_version >= 8) {
/* Use translated cargo. Might result in CT_INVALID (first refittable), if cargo is not defined. */
ei->cargo_type = GetCargoTranslation(ctype, _cur.grffile);
} else if (ctype < NUM_CARGO && HasBit(_cargo_mask, ctype)) {
/* Use untranslated cargo. */
ei->cargo_type = ctype;
} else { } else {
ei->cargo_type = CT_INVALID; ei->cargo_type = CT_INVALID;
grfmsg(2, "ShipVehicleChangeInfo: Invalid cargo type %d, using first refittable", cargo); grfmsg(2, "RailVehicleChangeInfo: Invalid cargo type %d, using first refittable", ctype);
} }
break; break;
} }