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

Scale link graph timeout and compression intervals by day length.

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-09-12 18:51:15 +01:00
parent 361b8b4540
commit 58dbc8fbd6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/station_cmd.cpp
View File

@@ -3570,7 +3570,7 @@ void DeleteStaleLinks(Station *from)
assert(to->goods[c].node == it->first); assert(to->goods[c].node == it->first);
++it; // Do that before removing the edge. Anything else may crash. ++it; // Do that before removing the edge. Anything else may crash.
assert(_date >= edge.LastUpdate()); assert(_date >= edge.LastUpdate());
uint timeout = LinkGraph::MIN_TIMEOUT_DISTANCE + (DistanceManhattan(from->xy, to->xy) >> 3); uint timeout = max<uint>((LinkGraph::MIN_TIMEOUT_DISTANCE + (DistanceManhattan(from->xy, to->xy) >> 3)) / _settings_game.economy.day_length_factor, 1);
if ((uint)(_date - edge.LastUpdate()) > timeout) { if ((uint)(_date - edge.LastUpdate()) > timeout) {
/* Have all vehicles refresh their next hops before deciding to /* Have all vehicles refresh their next hops before deciding to
* remove the node. */ * remove the node. */
@@ -3617,7 +3617,7 @@ void DeleteStaleLinks(Station *from)
} }
} }
assert(_date >= lg->LastCompression()); assert(_date >= lg->LastCompression());
if ((uint)(_date - lg->LastCompression()) > LinkGraph::COMPRESSION_INTERVAL) { if ((uint)(_date - lg->LastCompression()) > max<uint>(LinkGraph::COMPRESSION_INTERVAL / _settings_game.economy.day_length_factor, 1)) {
lg->Compress(); lg->Compress();
} }
} }