diff options
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index acc036636..f8bf61968 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -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()); |