cpp/openttd-patchpack/source Changeset - r22475:c7c9bf693afb

Changeset - r22475:c7c9bf693afb

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

fonsinchen - 8 years ago 2016-12-04 19:59:17
fonsinchen@openttd.org

(svn r27682) -Fix: Don't check if links are alive for manually routed cargo

1 file changed with 5 insertions and 1 deletions:

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -3445,6 +3445,7 @@ void RerouteCargo(Station *st, CargoID c @@
 void DeleteStaleLinks(Station *from)
+{
 	for (CargoID c = 0; c < NUM_CARGO; ++c) {
 		const bool auto_distributed = (_settings_game.linkgraph.GetDistributionType(c) != DT_MANUAL);
 		GoodsEntry &ge = from->goods[c];
 		LinkGraph *lg = LinkGraph::GetIfValid(ge.link_graph);
 		if (lg == NULL) continue;
@@ @@ -3457,6 +3458,9 @@ void DeleteStaleLinks(Station *from) @@
 			assert(_date >= edge.LastUpdate());
 			uint timeout = LinkGraph::MIN_TIMEOUT_DISTANCE + (DistanceManhattan(from->xy, to->xy) >> 3);
 			if ((uint)(_date - edge.LastUpdate()) > timeout) {
 				bool updated = false;
 				if (auto_distributed) {
 				/* Have all vehicles refresh their next hops before deciding to
 				 * remove the node. */
 				OrderList *l;
@@ @@ -3478,7 +3482,6 @@ void DeleteStaleLinks(Station *from) @@
 					*(vehicles.Append()) = l->GetFirstSharedVehicle();
+				}
 				bool updated = false;
 				Vehicle **iter = vehicles.Begin();
 				while (iter != vehicles.End()) {
 					Vehicle *v = *iter;
@@ @@ -3499,6 +3502,7 @@ void DeleteStaleLinks(Station *from) @@
 					if (iter == vehicles.End()) iter = vehicles.Begin();
+				}
+				}
 				if (!updated) {
 					/* If it's still considered dead remove it. */

0 comments (0 inline, 0 general)