From c681a9d5de92c5b252a4aed583fec97609f2b4ff Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Fri, 3 Jan 2020 13:02:35 +0000
Subject: [PATCH] Fix vehicle timetable automate flag from ChillPP v8 savegames

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

diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 2ee98ba4b9..6daf2012f4 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -3344,7 +3344,7 @@ bool AfterLoadGame()
 		}
 	}
 
-	if (SlXvIsFeaturePresent(XSLFI_CHILLPP)) {
+	if (SlXvIsFeaturePresent(XSLFI_CHILLPP, SL_CHILLPP_232)) {
 		// re-arrange vehicle_flags
 		Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
@@ -3352,6 +3352,13 @@ bool AfterLoadGame()
 			SB(v->vehicle_flags, VF_PATHFINDER_LOST, 1, GB(v->vehicle_flags, 8, 1));
 			SB(v->vehicle_flags, VF_SERVINT_IS_CUSTOM, 7, 0);
 		}
+	} else if (SlXvIsFeaturePresent(XSLFI_CHILLPP)) {
+		// re-arrange vehicle_flags
+		Vehicle *v;
+		FOR_ALL_VEHICLES(v) {
+			SB(v->vehicle_flags, VF_AUTOMATE_TIMETABLE, 1, GB(v->vehicle_flags, 6, 1));
+			SB(v->vehicle_flags, VF_STOP_LOADING, 9, 0);
+		}
 	}
 
 	if (IsSavegameVersionBefore(SLV_188)) {