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/engine_func.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/engine_func.h') diff --git a/src/engine_func.h b/src/engine_func.h index 1117311cb..65e88fe31 100644 --- a/src/engine_func.h +++ b/src/engine_func.h @@ -21,7 +21,6 @@ void DrawAircraftEngine(int x, int y, EngineID engine, SpriteID pal); bool IsEngineBuildable(EngineID engine, VehicleType type, CompanyID company); bool IsEngineRefittable(EngineID engine); -CargoID GetEngineCargoType(EngineID engine); void SetCachedEngineCounts(); void SetYearEngineAgingStops(); void StartupOneEngine(Engine *e, Date aging_date); -- cgit v1.2.3-54-g00ecf