summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-10-06 21:19:20 +0000
committerrubidium <rubidium@openttd.org>2009-10-06 21:19:20 +0000
commit80f0df17ba7d52900d3cb434d4feb65c83c4b772 (patch)
tree315a3186652e3a7966f5bd2572191081fa29dfc9
parentd52fa73bb14314d80811482c840fc6fc3e485b80 (diff)
downloadopenttd-80f0df17ba7d52900d3cb434d4feb65c83c4b772.tar.xz
(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.
-rw-r--r--src/cargopacket.cpp4
-rw-r--r--src/cargopacket.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp
index 79c31d9d8..b84dc46ec 100644
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@@ -28,8 +28,8 @@ void InitializeCargoPackets()
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;
diff --git a/src/cargopacket.h b/src/cargopacket.h
index 7f8114c2d..3417e3906 100644
--- a/src/cargopacket.h
+++ b/src/cargopacket.h
@@ -50,11 +50,11 @@ public:
/** Maximum number of items in a single cargo packet. */
static const uint16 MAX_COUNT = UINT16_MAX;
- 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
+ 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
/**
* Creates a new cargo packet
@@ -161,12 +161,12 @@ public:
};
private:
- List packets; ///< The cargo packets in this list
-
- uint count; ///< Cache for the number of cargo entities
Money feeder_share; ///< Cache for the feeder share
+ uint count; ///< Cache for the number of cargo entities
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();