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

Codechange: use TimerGameCalendar::Date for variables in linkgraph that are dates (#11187)

Browse Source
This commit is contained in:
Patric Stout
2023-08-12 16:02:38 +02:00
committed by GitHub
parent b7acf9e50e
commit a9ed590ca7
8 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/linkgraph/linkgraph.h
View File

@@ -171,10 +171,10 @@ public:
static const uint MIN_TIMEOUT_DISTANCE = 32;
/** Number of days before deleting links served only by vehicles stopped in depot. */
static const uint STALE_LINK_DEPOT_TIMEOUT = 1024;
static constexpr TimerGameCalendar::Date STALE_LINK_DEPOT_TIMEOUT = 1024;
/** Minimum number of days between subsequent compressions of a LG. */
static const uint COMPRESSION_INTERVAL = 256;
static constexpr TimerGameCalendar::Date COMPRESSION_INTERVAL = 256;
/**
* Scale a value from a link graph of age orig_age for usage in one of age
@@ -184,7 +184,7 @@ public:
* @param orig_age Age of the original link graph.
* @return scaled value.
*/
inline static uint Scale(uint val, uint target_age, uint orig_age)
inline static uint Scale(uint val, TimerGameCalendar::Date target_age, TimerGameCalendar::Date orig_age)
{
return val > 0 ? std::max(1U, val * target_age / orig_age) : 0;
}
@@ -198,7 +198,7 @@ public:
LinkGraph(CargoID cargo) : cargo(cargo), last_compression(TimerGameCalendar::date) {}
void Init(uint size);
void ShiftDates(int interval);
void ShiftDates(TimerGameCalendar::Date interval);
void Compress();
void Merge(LinkGraph *other);