(svn r10744) -Codechange: make the pool a little more OO, so it can be easier in other places.

1 files changed, 2 insertions, 6 deletions

diff --git a/src/order.h b/src/order.h
index 9703989e8..30d59517c 100644
--- a/src/order.h
+++ b/src/order.h
@@ -171,13 +171,9 @@ static inline bool HasOrderPoolFree(uint amount)
 	const Order *order;
 
 	/* There is always room if not all blocks in the pool are reserved */
-	if (_Order_pool.current_blocks < _Order_pool.max_blocks)
-		return true;
+	if (_Order_pool.CanAllocateMoreBlocks()) return true;
 
-	FOR_ALL_ORDERS(order)
-		if (!order->IsValid())
-			if (--amount == 0)
-				return true;
+	FOR_ALL_ORDERS(order) if (!order->IsValid() && --amount == 0) return true;
 
 	return false;
 }