From d3850e101c7deb3d6549dae3dcad9daa90c40946 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 21 Feb 2009 12:52:41 +0000 Subject: (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. --- src/ai/api/ai_engine.cpp | 24 +++--------------------- src/ai/api/ai_event_types.cpp | 25 +++---------------------- 2 files changed, 6 insertions(+), 43 deletions(-) (limited to 'src/ai/api') diff --git a/src/ai/api/ai_engine.cpp b/src/ai/api/ai_engine.cpp index c6bee2bb6..3a2621299 100644 --- a/src/ai/api/ai_engine.cpp +++ b/src/ai/api/ai_engine.cpp @@ -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; - - 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; + const Engine *e = ::GetEngine(engine_id); + if (!e->CanCarryCargo()) return CT_INVALID; - default: NOT_REACHED(); - } + return e->GetDefaultCargoType(); } /* static */ bool AIEngine::CanRefitCargo(EngineID engine_id, CargoID cargo_id) diff --git a/src/ai/api/ai_event_types.cpp b/src/ai/api/ai_event_types.cpp index d3e0b4d83..4c66ceadb 100644 --- a/src/ai/api/ai_event_types.cpp +++ b/src/ai/api/ai_event_types.cpp @@ -21,28 +21,9 @@ char *AIEventEnginePreview::GetName() CargoID AIEventEnginePreview::GetCargoType() { - switch (::GetEngine(engine)->type) { - case VEH_ROAD: { - const RoadVehicleInfo *vi = ::RoadVehInfo(engine); - return vi->cargo_type; - } break; - - case VEH_TRAIN: { - const RailVehicleInfo *vi = ::RailVehInfo(engine); - return vi->cargo_type; - } break; - - case VEH_SHIP: { - const ShipVehicleInfo *vi = ::ShipVehInfo(engine); - return vi->cargo_type; - } break; - - case VEH_AIRCRAFT: { - return CT_PASSENGERS; - } break; - - default: NOT_REACHED(); - } + const Engine *e = ::GetEngine(engine); + if (!e->CanCarryCargo()) return CT_INVALID; + return e->GetDefaultCargoType(); } int32 AIEventEnginePreview::GetCapacity() -- cgit v1.2.3-70-g09d2