From d01f5e9e7e78ceb22e36d5378f74b6ef4a842756 Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 28 Oct 2009 20:15:46 +0000 Subject: (svn r17898) -Fix: [NoAI] Improve behaviour of (AIEngine|AIEventEnginePreview)::GetCargoType() and AIEngine::CanRefitCargo() wrt. articulated vehicles. --- src/ai/api/ai_engine.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/ai/api/ai_engine.cpp') diff --git a/src/ai/api/ai_engine.cpp b/src/ai/api/ai_engine.cpp index 0be62af1f..00394444f 100644 --- a/src/ai/api/ai_engine.cpp +++ b/src/ai/api/ai_engine.cpp @@ -42,10 +42,18 @@ { if (!IsValidEngine(engine_id)) return CT_INVALID; - const Engine *e = ::Engine::Get(engine_id); - if (!e->CanCarryCargo()) return CT_INVALID; + CargoArray cap = ::GetCapacityOfArticulatedParts(engine_id); + + CargoID most_cargo = CT_INVALID; + uint amount = 0; + for (CargoID cid = 0; cid < NUM_CARGO; cid++) { + if (cap[cid] > amount) { + amount = cap[cid]; + most_cargo = cid; + } + } - return e->GetDefaultCargoType(); + return most_cargo; } /* static */ bool AIEngine::CanRefitCargo(EngineID engine_id, CargoID cargo_id) @@ -53,8 +61,7 @@ if (!IsValidEngine(engine_id)) return false; if (!AICargo::IsValidCargo(cargo_id)) return false; - if (GetCargoType(engine_id) == cargo_id) return true; - return ::CanRefitTo(engine_id, cargo_id); + return HasBit(::GetUnionOfArticulatedRefitMasks(engine_id, true), cargo_id); } /* static */ bool AIEngine::CanPullCargo(EngineID engine_id, CargoID cargo_id) -- cgit v1.2.3-54-g00ecf