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

Change: Increase max cargo age and let min cargo payment approach zero. (#10596)

Browse Source 
Co-authored-by: Michael Lutz <michi@icosahedron.de>
This commit is contained in:
dP
2023-04-10 14:34:28 +04:00
committed by GitHub
parent 770df65141
commit e2f1cd44dc
7 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cargopacket.h
View File

@@ -44,7 +44,7 @@ struct CargoPacket : CargoPacketPool::PoolItem<&_cargopacket_pool> {
private:
Money feeder_share; ///< Value of feeder pickup to be paid for on delivery of cargo.
uint16 count; ///< The amount of cargo in this packet.
byte 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.
SourceType 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.
@@ -126,10 +126,10 @@ public:
/**
* Gets the number of days this cargo has been in transit.
* This number isn't really in days, but in 2.5 days (CARGO_AGING_TICKS = 185 ticks) and
* it is capped at 255.
* it is capped at UINT16_MAX.
* @return Length this cargo has been in transit.
*/
inline byte DaysInTransit() const
inline uint16 DaysInTransit() const
{
return this->days_in_transit;
}
@@ -221,8 +221,8 @@ public:
};
protected:
uint count; ///< Cache for the number of cargo entities.
uint cargo_days_in_transit; ///< Cache for the sum of number of days in transit of each entity; comparable to man-hours.
uint count; ///< Cache for the number of cargo entities.
uint64 cargo_days_in_transit; ///< Cache for the sum of number of days in transit of each entity; comparable to man-hours.
Tcont packets; ///< The cargo packets in this list.