From cea98ea0e64b31ebf77c31cc6e6fc4f152e12e28 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 21 Apr 2008 09:20:42 +0000 Subject: [PATCH] (svn r12815) -Codechange: reshuffle some variables in the CargoPacket struct saving 4 of 36 bytes with a 32 bit compiler and 8 of 48 bytes on 64 bit compiler per cargo packets. There are generally more cargopackets in game than vehicles. --- src/cargopacket.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cargopacket.h b/src/cargopacket.h index cce9a43986..8e3d77a653 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -22,13 +22,13 @@ DECLARE_OLD_POOL(CargoPacket, CargoPacket, 10, 1000) * Container for cargo from the same location and time */ struct CargoPacket : PoolItem { - StationID source; ///< The station where the cargo came from first + Money feeder_share; ///< Value of feeder pickup to be paid for on delivery of cargo TileIndex source_xy; ///< The origin of the cargo (first station in feeder chain) TileIndex loaded_at_xy; ///< Location where this cargo has been loaded into the vehicle + StationID source; ///< The station where the cargo came from first uint16 count; ///< The amount of cargo in this packet byte days_in_transit; ///< Amount of days this packet has been in transit - Money feeder_share; ///< Value of feeder pickup to be paid for on delivery of cargo bool paid_for; ///< Have we been paid for this cargo packet? /**