Changeset - r13215:922f97d8d59c
[Not reviewed]
master
0 2 0
rubidium - 15 years ago 2009-10-06 21:19:20
rubidium@openttd.org
(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.
2 files changed with 8 insertions and 8 deletions:
0 comments (0 inline, 0 general)
src/cargopacket.cpp
Show inline comments
 
@@ -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;
 

	
src/cargopacket.h
Show inline comments
 
@@ -50,11 +50,11 @@ public:
 
	/** 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 @@ public:
 
	};
 

	
 
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();
0 comments (0 inline, 0 general)