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

Fix MP desync caused by incorrect FlowStat::ScaleToMonthly scaling

Browse Source 
Fixes: 51a66b95
This commit is contained in:
Jonathan G Rennison
2023-07-10 20:21:27 +01:00
parent 3dd7d7318c
commit 8c430f6a12
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/linkgraph/flowmapper.cpp
View File

@@ -53,7 +53,7 @@ void FlowMapper::Run(LinkGraphJob &job) const
/* Scale by time the graph has been running without being compressed. Add 1 to avoid /* Scale by time the graph has been running without being compressed. Add 1 to avoid
* division by 0 if spawn date == last compression date. This matches * division by 0 if spawn date == last compression date. This matches
* LinkGraph::Monthly(). */ * LinkGraph::Monthly(). */
uint runtime = _scaled_date_ticks - job.LastCompression() + 1; uint runtime = ClampTo<uint>(DateTicksToScaledDateTicks(job.StartDateTicks()) - job.LastCompression() + 1);
for (auto &it : flows) { for (auto &it : flows) {
it.ScaleToMonthly(runtime); it.ScaleToMonthly(runtime);
} }

2
src/linkgraph/linkgraphjob.h
View File

@@ -346,7 +346,7 @@ public:
* Get the date when the underlying link graph was last compressed. * Get the date when the underlying link graph was last compressed.
* @return Compression date. * @return Compression date.
*/ */
inline Date LastCompression() const { return this->link_graph.LastCompression(); } inline DateTicksScaled LastCompression() const { return this->link_graph.LastCompression(); }
/** /**
* Get the ID of the underlying link graph. * Get the ID of the underlying link graph.