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

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

View File

@@ -50,7 +50,7 @@ LinkGraph::BaseEdge::BaseEdge(NodeID dest_node)
* This is useful if the date has been modified with the cheat menu.
* @param interval Number of days to be added or subtracted.
*/
void LinkGraph::ShiftDates(int interval)
void LinkGraph::ShiftDates(TimerGameCalendar::Date interval)
{
this->last_compression += interval;
for (NodeID node1 = 0; node1 < this->Size(); ++node1) {

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);

View File

@@ -223,7 +223,7 @@ public:
* Change the join date on date cheating.
* @param interval Number of days to add.
*/
inline void ShiftJoinDate(int interval) { this->join_date += interval; }
inline void ShiftJoinDate(TimerGameCalendar::Date interval) { this->join_date += interval; }
/**
* Get the link graph settings for this component.

View File

@@ -132,7 +132,7 @@ void LinkGraphSchedule::SpawnAll()
* graph jobs by the number of days given.
* @param interval Number of days to be added or subtracted.
*/
void LinkGraphSchedule::ShiftDates(int interval)
void LinkGraphSchedule::ShiftDates(TimerGameCalendar::Date interval)
{
for (LinkGraph *lg : LinkGraph::Iterate()) lg->ShiftDates(interval);
for (LinkGraphJob *lgj : LinkGraphJob::Iterate()) lgj->ShiftJoinDate(interval);

View File

@@ -58,7 +58,7 @@ public:
bool IsJoinWithUnfinishedJobDue() const;
void JoinNext();
void SpawnAll();
void ShiftDates(int interval);
void ShiftDates(TimerGameCalendar::Date interval);
/**
* Queue a link graph for execution.