summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-04-21 09:20:42 +0000
committerrubidium <rubidium@openttd.org>2008-04-21 09:20:42 +0000
commitc5ac9ee6787715370dc2d35d85a612048c1ac3f9 (patch)
treecfef7172ec777e822b6a46e5102c6af78446ad69
parent4ce50a0d64a9225a8a47023f44fda5d8ef5485ee (diff)
downloadopenttd-c5ac9ee6787715370dc2d35d85a612048c1ac3f9.tar.xz
(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.
-rw-r--r--src/cargopacket.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cargopacket.h b/src/cargopacket.h
index cce9a4398..8e3d77a65 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<CargoPacket, CargoPacketID, &_CargoPacket_pool> {
- 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?
/**