diff options
Diffstat (limited to 'src/ai')
| -rw-r--r-- | src/ai/api/ai_engine.cpp | 24 | ||||
| -rw-r--r-- | src/ai/api/ai_event_types.cpp | 25 |
2 files changed, 6 insertions, 43 deletions
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() |