Mercurial > hg > openttd
changeset 13225:a90c47f6d7f0 draft
(svn r17732) -Codechange: reorder some variables of cargo packets/cargo lists to get better alignment *and* smaller structs; both from 40 bytes to 32 bytes on 64 bits.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Tue, 06 Oct 2009 21:19:20 +0000 |
| parents | 194a605c55ab |
| children | 5c4fb8258742 |
| files | src/cargopacket.cpp src/cargopacket.h |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -28,8 +28,8 @@ CargoPacket::CargoPacket(StationID source, uint16 count, SourceType source_type, SourceID source_id) : count(count), - source(source), - source_id(source_id) + source_id(source_id), + source(source) { this->source_type = source_type;
--- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -50,11 +50,11 @@ /** Maximum number of items in a single cargo packet. */ static const uint16 MAX_COUNT = UINT16_MAX; + SourceTypeByte source_type; ///< Type of \c source_id + SourceID source_id; ///< Index of source, INVALID_SOURCE if unknown/invalid + StationID source; ///< The station where the cargo came from first 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 - SourceTypeByte source_type; ///< Type of \c source_id - SourceID source_id; ///< Index of source, INVALID_SOURCE if unknown/invalid /** * Creates a new cargo packet @@ -161,12 +161,12 @@ }; private: - List packets; ///< The cargo packets in this list - + Money feeder_share; ///< Cache for the feeder share uint count; ///< Cache for the number of cargo entities - Money feeder_share; ///< Cache for the feeder share uint days_in_transit; ///< Cache for the number of days in transit + List packets; ///< The cargo packets in this list + public: /** The GoodsEntry has a CargoList. */ friend const struct SaveLoad *GetGoodsDesc();