mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r14188) -Codechange: [NewGRF] Cargo type of 0xFF is specified to be 'use first refittable cargo', so don't issue a warning for it.
This commit is contained in:
parent
468655c916
commit
2b67c01a24
|
@ -539,6 +539,9 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
|
||||||
|
|
||||||
if (ctype < NUM_CARGO && HasBit(_cargo_mask, ctype)) {
|
if (ctype < NUM_CARGO && HasBit(_cargo_mask, ctype)) {
|
||||||
rvi->cargo_type = ctype;
|
rvi->cargo_type = ctype;
|
||||||
|
} else if (ctype == 0xFF) {
|
||||||
|
/* 0xFF is specified as 'use first refittable' */
|
||||||
|
rvi->cargo_type = CT_INVALID;
|
||||||
} else {
|
} else {
|
||||||
rvi->cargo_type = CT_INVALID;
|
rvi->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);
|
||||||
|
@ -732,8 +735,9 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
|
||||||
|
|
||||||
if (cargo < NUM_CARGO && HasBit(_cargo_mask, cargo)) {
|
if (cargo < NUM_CARGO && HasBit(_cargo_mask, cargo)) {
|
||||||
rvi->cargo_type = cargo;
|
rvi->cargo_type = cargo;
|
||||||
} else {
|
} else if (cargo == 0xFF) {
|
||||||
rvi->cargo_type = CT_INVALID;
|
rvi->cargo_type = CT_INVALID;
|
||||||
|
} else {
|
||||||
grfmsg(2, "RoadVehicleChangeInfo: Invalid cargo type %d, using first refittable", cargo);
|
grfmsg(2, "RoadVehicleChangeInfo: Invalid cargo type %d, using first refittable", cargo);
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
@ -849,6 +853,8 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
|
||||||
|
|
||||||
if (cargo < NUM_CARGO && HasBit(_cargo_mask, cargo)) {
|
if (cargo < NUM_CARGO && HasBit(_cargo_mask, cargo)) {
|
||||||
svi->cargo_type = cargo;
|
svi->cargo_type = cargo;
|
||||||
|
} else if (cargo == 0xFF) {
|
||||||
|
svi->cargo_type = CT_INVALID;
|
||||||
} else {
|
} else {
|
||||||
svi->cargo_type = CT_INVALID;
|
svi->cargo_type = CT_INVALID;
|
||||||
grfmsg(2, "ShipVehicleChangeInfo: Invalid cargo type %d, using first refittable", cargo);
|
grfmsg(2, "ShipVehicleChangeInfo: Invalid cargo type %d, using first refittable", cargo);
|
||||||
|
|
Loading…
Reference in New Issue