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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-12-05 19:24:57 +00:00
parent fe2e00a2db cdbb864725
commit 8630512810
1 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/station_cmd.cpp
View File

@@ -3577,6 +3577,7 @@ void RerouteCargo(Station *st, CargoID c, StationID avoid, StationID avoid2)
void DeleteStaleLinks(Station *from) void DeleteStaleLinks(Station *from)
{ {
for (CargoID c = 0; c < NUM_CARGO; ++c) { for (CargoID c = 0; c < NUM_CARGO; ++c) {
const bool auto_distributed = (_settings_game.linkgraph.GetDistributionType(c) != DT_MANUAL);
GoodsEntry &ge = from->goods[c]; GoodsEntry &ge = from->goods[c];
LinkGraph *lg = LinkGraph::GetIfValid(ge.link_graph); LinkGraph *lg = LinkGraph::GetIfValid(ge.link_graph);
if (lg == NULL) continue; if (lg == NULL) continue;
@@ -3589,36 +3590,52 @@ void DeleteStaleLinks(Station *from)
assert(_date >= edge.LastUpdate()); assert(_date >= edge.LastUpdate());
uint timeout = max<uint>((LinkGraph::MIN_TIMEOUT_DISTANCE + (DistanceManhattan(from->xy, to->xy) >> 3)) / _settings_game.economy.day_length_factor, 1); 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
* remove the node. */
bool updated = false; bool updated = false;
OrderList *l;
FOR_ALL_ORDER_LISTS(l) { if (auto_distributed) {
bool found_from = false; /* Have all vehicles refresh their next hops before deciding to
bool found_to = false; * remove the node. */
for (Order *order = l->GetFirstOrder(); order != NULL; order = order->next) { OrderList *l;
if (!order->IsType(OT_GOTO_STATION) && !order->IsType(OT_IMPLICIT)) continue; SmallVector<Vehicle *, 32> vehicles;
if (order->GetDestination() == from->index) { FOR_ALL_ORDER_LISTS(l) {
found_from = true; bool found_from = false;
if (found_to) break; bool found_to = false;
} else if (order->GetDestination() == to->index) { for (Order *order = l->GetFirstOrder(); order != NULL; order = order->next) {
found_to = true; if (!order->IsType(OT_GOTO_STATION) && !order->IsType(OT_IMPLICIT)) continue;
if (found_from) break; if (order->GetDestination() == from->index) {
found_from = true;
if (found_to) break;
} else if (order->GetDestination() == to->index) {
found_to = true;
if (found_from) break;
}
} }
if (!found_to || !found_from) continue;
*(vehicles.Append()) = l->GetFirstSharedVehicle();
} }
if (!found_to || !found_from) continue;
for (Vehicle *v = l->GetFirstSharedVehicle(); !updated && v != NULL; v = v->NextShared()) { Vehicle **iter = vehicles.Begin();
/* There is potential for optimization here: while (iter != vehicles.End()) {
* - Usually consists of the same order list are the same. It's probably better to Vehicle *v = *iter;
* first check the first of each list, then the second of each list and so on.
* - We could try to figure out if we've seen a consist with the same cargo on the
* same list already and if the consist can actually carry the cargo we're looking
* for. With conditional and refit orders this is not quite trivial, though. */
LinkRefresher::Run(v, false); // Don't allow merging. Otherwise lg might get deleted. LinkRefresher::Run(v, false); // Don't allow merging. Otherwise lg might get deleted.
if (edge.LastUpdate() == _date) updated = true; if (edge.LastUpdate() == _date) {
updated = true;
break;
}
Vehicle *next_shared = v->NextShared();
if (next_shared) {
*iter = next_shared;
++iter;
} else {
vehicles.Erase(iter);
}
if (iter == vehicles.End()) iter = vehicles.Begin();
} }
if (updated) break;
} }
if (!updated) { if (!updated) {
/* If it's still considered dead remove it. */ /* If it's still considered dead remove it. */
node.RemoveEdge(to->goods[c].node); node.RemoveEdge(to->goods[c].node);