diff --git a/src/economy_base.h b/src/economy_base.h --- a/src/economy_base.h +++ b/src/economy_base.h @@ -7,19 +7,26 @@ #include "cargopacket.h" +/** Type of pool to store cargo payments in. */ +typedef Pool CargoPaymentPool; +/** The actual pool to store cargo payments in. */ +extern CargoPaymentPool _cargo_payment_pool; + /** * Helper class to perform the cargo payment. */ -struct CargoPayment { +struct CargoPayment : CargoPaymentPool::PoolItem<&_cargo_payment_pool> { Vehicle *front; ///< The front vehicle to do the payment of Money route_profit; ///< The amount of money to add/remove from the bank account Money visual_profit; ///< The visual profit to show + /* Unsaved variables */ Company *owner; ///< The owner of the vehicle StationID current_station; ///< The current station CargoID ct; ///< The currently handled cargo type /** Constructor for pool saveload */ + CargoPayment() {} CargoPayment(Vehicle *front); ~CargoPayment(); @@ -33,4 +40,7 @@ struct CargoPayment { void SetCargo(CargoID ct) { this->ct = ct; } }; +#define FOR_ALL_CARGO_PAYMENTS_FROM(var, start) FOR_ALL_ITEMS_FROM(CargoPayment, cargo_payment_index, var, start) +#define FOR_ALL_CARGO_PAYMENTS(var) FOR_ALL_CARGO_PAYMENTS_FROM(var, 0) + #endif /* ECONOMY_BASE_H */