dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Reorder some high-use structs to reduce their size. (#11201)

Browse Source 
This reduces GoodsEntry from 144 to 136 bytes (thereby reducing Station from 9704 bytes to 9192 bytes), and CargoPacket from 40 bytes to 32 bytes.

(cherry picked from commit bd150df914)
This commit is contained in:
PeterN
2023-09-02 21:56:36 +01:00
committed by Jonathan G Rennison
parent d17c949c22
commit 186a082613
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cargopacket.cpp
View File

@@ -121,9 +121,9 @@ CargoPacket::CargoPacket(StationID source, TileIndex source_xy, uint16 count, So
count(count), count(count),
days_in_transit(0), days_in_transit(0),
feeder_share(0), feeder_share(0),
source_id(source_id),
source_xy(source_xy), source_xy(source_xy),
loaded_at_xy(0), loaded_at_xy(0),
source_id(source_id),
source(source), source(source),
source_type(source_type) source_type(source_type)
{ {
@@ -148,9 +148,9 @@ CargoPacket::CargoPacket(uint16 count, uint16 days_in_transit, StationID source,
count(count), count(count),
days_in_transit(days_in_transit), days_in_transit(days_in_transit),
feeder_share(feeder_share), feeder_share(feeder_share),
source_id(source_id),
source_xy(source_xy), source_xy(source_xy),
loaded_at_xy(loaded_at_xy), loaded_at_xy(loaded_at_xy),
source_id(source_id),
source(source), source(source),
source_type(source_type) source_type(source_type)
{ {

2
src/cargopacket.h
View File

@@ -61,12 +61,12 @@ private:
uint16 count; ///< The amount of cargo in this packet. uint16 count; ///< The amount of cargo in this packet.
uint16 days_in_transit; ///< Amount of days this packet has been in transit. uint16 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. Money feeder_share; ///< Value of feeder pickup to be paid for on delivery of cargo.
SourceID source_id; ///< Index of source, INVALID_SOURCE if unknown/invalid.
TileIndex source_xy; ///< The origin of the cargo (first station in feeder chain). TileIndex source_xy; ///< The origin of the cargo (first station in feeder chain).
union { union {
TileIndex loaded_at_xy; ///< Location where this cargo has been loaded into the vehicle. TileIndex loaded_at_xy; ///< Location where this cargo has been loaded into the vehicle.
StationID_32bit next_station; ///< Station where the cargo wants to go next. StationID_32bit next_station; ///< Station where the cargo wants to go next.
}; };
SourceID source_id; ///< Index of source, INVALID_SOURCE if unknown/invalid.
StationID source; ///< The station where the cargo came from first. StationID source; ///< The station where the cargo came from first.
SourceType source_type; ///< Type of \c source_id. SourceType source_type; ///< Type of \c source_id.
uint8 flags = 0; ///< NOSAVE: temporary flags uint8 flags = 0; ///< NOSAVE: temporary flags