From f0b0691bfe603e362cd5760240582cec410876ff Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 9 Jan 2009 14:59:02 +0000 Subject: (svn r14933) -Codechange: check the whether a pool item can be constructed instead of trying to make it and check for NULL. --- src/articulated_vehicles.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/articulated_vehicles.cpp') diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp index 9f2e05bc0..bb21b49f8 100644 --- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -17,6 +17,10 @@ uint CountArticulatedParts(EngineID engine_type, bool purchase_window) { if (!HasBit(EngInfo(engine_type)->callbackmask, CBM_VEHICLE_ARTIC_ENGINE)) return 0; + /* If we can't allocate a vehicle now, we can't allocate it in the command + * either, so it doesn't matter how many articulated parts there are. */ + if (!Vehicle::CanAllocateItem()) return 0; + Vehicle *v = NULL;; if (!purchase_window) { v = new InvalidVehicle(); -- cgit v1.2.3-54-g00ecf