(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.

1 files changed, 1 insertions, 3 deletions

diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 1929760c3..ccb104d2a 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -216,9 +216,7 @@ Order UnpackOldOrder(uint16 packed)
 	 * Sanity check
 	 * TTD stores invalid orders as OT_NOTHING with non-zero flags/station
 	 */
-	if (!order.IsValid() && (order.GetLoadType() != 0 || order.GetUnloadType() != 0 || order.GetDestination() != 0)) {
-		order.MakeDummy();
-	}
+	if (!order.IsValid() && packed != 0) order.MakeDummy();
 
 	return order;
 }