(svn r15541) -Revert (r15399): 'v->cargo_type' is also used in other places, which cannot accept CT_INVALID.
-Codechange: Add Engine::GetDefaultCargoType() and Engine::CanCarryCargo() and use them. -Fix [FS#2617]: When articulated parts have no available default cargo, use the cargo type of the first part for livery selection. -Change: To decide whether a vehicle is refittable do not test its current capacity for being zero, but always use the 'capacity property'. Note: The property is used unmodifed without calling CB 15/36. By setting it to a non-zero value and returning zero in the callback vehicles can be refitted to/from zero capacity for e.g. livery effects. Note: It is intentional that you cannot control refittability by CB 36.
This commit is contained in:
@@ -33,28 +33,10 @@
|
||||
{
|
||||
if (!IsValidEngine(engine_id)) return CT_INVALID;
|
||||
|
||||
switch (::GetEngine(engine_id)->type) {
|
||||
case VEH_ROAD: {
|
||||
const RoadVehicleInfo *vi = ::RoadVehInfo(engine_id);
|
||||
return vi->cargo_type;
|
||||
} break;
|
||||
const Engine *e = ::GetEngine(engine_id);
|
||||
if (!e->CanCarryCargo()) return CT_INVALID;
|
||||
|
||||
case VEH_TRAIN: {
|
||||
const RailVehicleInfo *vi = ::RailVehInfo(engine_id);
|
||||
return vi->cargo_type;
|
||||
} break;
|
||||
|
||||
case VEH_SHIP: {
|
||||
const ShipVehicleInfo *vi = ::ShipVehInfo(engine_id);
|
||||
return vi->cargo_type;
|
||||
} break;
|
||||
|
||||
case VEH_AIRCRAFT: {
|
||||
return CT_PASSENGERS;
|
||||
} break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
return e->GetDefaultCargoType();
|
||||
}
|
||||
|
||||
/* static */ bool AIEngine::CanRefitCargo(EngineID engine_id, CargoID cargo_id)
|
||||
|
Reference in New Issue
Block a user