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/vehicle.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/vehicle.cpp') diff --git a/src/vehicle.cpp b/src/vehicle.cpp index b88a1f3b7..ec20909f1 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -242,17 +242,13 @@ byte VehicleRandomBits() /* static */ bool Vehicle::AllocateList(Vehicle **vl, int num) { + if (!Vehicle::CanAllocateItem(num)) return false; + if (vl == NULL) return true; + uint counter = _Vehicle_pool.first_free_index; for (int i = 0; i != num; i++) { - Vehicle *v = AllocateRaw(counter); - - if (v == NULL) return false; - v = new (v) InvalidVehicle(); - - if (vl != NULL) { - vl[i] = v; - } + vl[i] = new (AllocateRaw(counter)) InvalidVehicle(); counter++; } -- cgit v1.2.3-54-g00ecf