(svn r22023) -Fix: verify we can allocate a CargoPacket and CargoPayment before we actually try to do so

-Codechange: increase the limit of number of CargoPayments to match the limit of Vehicles (Rubidium)

1 files changed, 4 insertions, 0 deletions

diff --git a/src/economy.cpp b/src/economy.cpp
index c9e55653a..3d2a419ee 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1093,6 +1093,10 @@ void PrepareUnload(Vehicle *front_v)
 	}
 
 	assert(front_v->cargo_payment == NULL);
+	/* One CargoPayment per vehicle and the vehicle limit equals the
+	 * limit in number of CargoPayments. Can't go wrong. */
+	assert_compile(CargoPaymentPool::MAX_SIZE == VehiclePool::MAX_SIZE);
+	assert(CargoPayment::CanAllocateItem());
 	front_v->cargo_payment = new CargoPayment(front_v);
 }