# HG changeset patch
# User Peter Nelson <peter1138@openttd.org>
# Date 2023-09-11 21:33:27
# Node ID 9307505907d534d315a54c682a118b5ed945ab08
# Parent  e2da1b3040ed92d66b7136fb2c020860fa5c267d

Codechange: Shuffle CargoPayment members to reduce padding.

diff --git a/src/economy.cpp b/src/economy.cpp
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1188,8 +1188,8 @@ static void TriggerIndustryProduction(In
  * @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)
 {
 }
 
diff --git a/src/economy_base.h b/src/economy_base.h
--- a/src/economy_base.h
+++ b/src/economy_base.h
@@ -22,16 +22,16 @@ extern CargoPaymentPool _cargo_payment_p
  * 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);