diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cargopacket.cpp | 4 | ||||
| -rw-r--r-- | src/cargopacket.h | 12 |
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(); |