mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: Shuffle CargoPayment members to reduce padding.

This commit is contained in:
Peter Nelson 2023-09-11 22:33:27 +01:00 committed by PeterN
parent a3c70ee6fb
commit 2fdc22e7ea
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/economy.cpp
View File

@ -1188,8 +1188,8 @@ static void TriggerIndustryProduction(Industry *i)
* @param front The front of the train
*/
CargoPayment::CargoPayment(Vehicle *front) :
front(front),
current_station(front->last_station_visited)
current_station(front->last_station_visited),
front(front)
{
}

10
src/economy_base.h
View File

@ -22,16 +22,16 @@ extern CargoPaymentPool _cargo_payment_pool;
* Helper class to perform the cargo payment.
*/
struct CargoPayment : CargoPaymentPool::PoolItem<&_cargo_payment_pool> {
/* CargoPaymentID index member of CargoPaymentPool is 4 bytes. */
StationID current_station; ///< NOSAVE: The current station
CargoID ct; ///< NOSAVE: The currently handled cargo type
Company *owner; ///< NOSAVE: The owner of the vehicle
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
Money visual_transfer; ///< The transfer credits to be shown
/* 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);