From 5108a71240454c3fbd47edf218cf4ccf8135ba7f Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Wed, 2 Sep 2015 21:25:33 +0100
Subject: [PATCH] SpringPP load: remove wait for cargo orders.

---
 src/saveload/afterload.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index fc1b03de78..5f133dd77e 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -3170,6 +3170,14 @@ bool AfterLoadGame()
 		}
 	}
 
+	if (SlXvIsFeaturePresent(XSLFI_SPRINGPP)) {
+		/* convert wait for cargo orders to ordinary load if possible */
+		Order *order;
+		FOR_ALL_ORDERS(order) {
+			if (order->GetLoadType() == static_cast<OrderLoadFlags>(1)) order->SetLoadType(OLF_LOAD_IF_POSSIBLE);
+		}
+	}
+
 	/* Station acceptance is some kind of cache */
 	if (IsSavegameVersionBefore(127)) {
 		Station *st;