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

(svn r25898) -Codechange: Add second timestamp for 'restricted links' to all edges.

Browse Source
This commit is contained in:
fonsinchen
2013-10-22 16:13:28 +00:00
parent 725b7033ef
commit d0c610f0ec
5 changed files with 104 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/station_cmd.cpp
View File

@@ -3417,13 +3417,18 @@ void DeleteStaleLinks(Station *from)
Edge edge = it->second;
Station *to = Station::Get((*lg)[it->first].Station());
assert(to->goods[c].node == it->first);
++it; // Do that before removing the node. Anything else may crash.
++it; // Do that before removing the edge. Anything else may crash.
assert(_date >= edge.LastUpdate());
if ((uint)(_date - edge.LastUpdate()) > LinkGraph::MIN_TIMEOUT_DISTANCE +
(DistanceManhattan(from->xy, to->xy) >> 2)) {
uint timeout = LinkGraph::MIN_TIMEOUT_DISTANCE + (DistanceManhattan(from->xy, to->xy) >> 2);
if ((uint)(_date - edge.LastUpdate()) > timeout) {
node.RemoveEdge(to->goods[c].node);
ge.flows.DeleteFlows(to->index);
RerouteCargo(from, c, to->index, from->index);
} else if (edge.LastUnrestrictedUpdate() != INVALID_DATE && (uint)(_date - edge.LastUnrestrictedUpdate()) > timeout) {
edge.Restrict();
RerouteCargo(from, c, to->index, from->index);
} else if (edge.LastRestrictedUpdate() != INVALID_DATE && (uint)(_date - edge.LastRestrictedUpdate()) > timeout) {
edge.Release();
}
}
assert(_date >= lg->LastCompression());