mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Replace FOR_ALL_CARGO_PAYMENTS with range-based for loops

pull/7871/head
glx 2019-12-15 18:14:51 +01:00 committed by Niels Martin Hansen
parent fa9769f81a
commit 1c92ba8ebe
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/economy_base.h
View File

@ -47,17 +47,4 @@ struct CargoPayment : CargoPaymentPool::PoolItem<&_cargo_payment_pool> {
void SetCargo(CargoID ct) { this->ct = ct; } void SetCargo(CargoID ct) { this->ct = ct; }
}; };
/**
* Iterate over all cargo payments from a given start position.
* @param var The variable used for iterating.
* @param start The start of the iteration.
*/
#define FOR_ALL_CARGO_PAYMENTS_FROM(var, start) FOR_ALL_ITEMS_FROM(CargoPayment, cargo_payment_index, var, start)
/**
* Iterate over all cargo payments.
* @param var The variable used for iterating.
*/
#define FOR_ALL_CARGO_PAYMENTS(var) FOR_ALL_CARGO_PAYMENTS_FROM(var, 0)
#endif /* ECONOMY_BASE_H */ #endif /* ECONOMY_BASE_H */

3
src/saveload/afterload.cpp
View File

@ -822,8 +822,7 @@ bool AfterLoadGame()
} }
/* Fix the cache for cargo payments. */ /* Fix the cache for cargo payments. */
CargoPayment *cp; for (CargoPayment *cp : CargoPayment::Iterate()) {
FOR_ALL_CARGO_PAYMENTS(cp) {
cp->front->cargo_payment = cp; cp->front->cargo_payment = cp;
cp->current_station = cp->front->last_station_visited; cp->current_station = cp->front->last_station_visited;
} }

6
src/saveload/economy_sl.cpp
View File

@ -72,8 +72,7 @@ static const SaveLoad _cargopayment_desc[] = {
static void Save_CAPY() static void Save_CAPY()
{ {
CargoPayment *cp; for (CargoPayment *cp : CargoPayment::Iterate()) {
FOR_ALL_CARGO_PAYMENTS(cp) {
SlSetArrayIndex(cp->index); SlSetArrayIndex(cp->index);
SlObject(cp, _cargopayment_desc); SlObject(cp, _cargopayment_desc);
} }
@ -91,8 +90,7 @@ static void Load_CAPY()
static void Ptrs_CAPY() static void Ptrs_CAPY()
{ {
CargoPayment *cp; for (CargoPayment *cp : CargoPayment::Iterate()) {
FOR_ALL_CARGO_PAYMENTS(cp) {
SlObject(cp, _cargopayment_desc); SlObject(cp, _cargopayment_desc);
} }
} }