@@ -181,13 +181,13 @@ bool Engine::CanCarryCargo() const
case VEH_SHIP:
case VEH_AIRCRAFT:
break;
default: NOT_REACHED();
}
return this->GetDefaultCargoType() != CT_INVALID;
return IsValidCargoID(this->GetDefaultCargoType());
/**
* Determines capacity of a given vehicle from scratch.
* For aircraft the main capacity is determined. Mail might be present as well.
@@ -1253,13 +1253,13 @@ bool IsEngineRefittable(EngineID engine)
if (HasBit(ei->callback_mask, CBM_VEHICLE_CARGO_SUFFIX)) return true;
/* Is there any cargo except the default cargo? */
CargoID default_cargo = e->GetDefaultCargoType();
CargoTypes default_cargo_mask = 0;
SetBit(default_cargo_mask, default_cargo);
return default_cargo != CT_INVALID && ei->refit_mask != default_cargo_mask;
return IsValidCargoID(default_cargo) && ei->refit_mask != default_cargo_mask;
* Check for engines that have an appropriate availability.
*/
void CheckEngines()