- Fix: recent code additions broke savegame compatibility. Some code now also works for UB, as otherwise code gets needlessly complicated.

- Improved code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6260 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Laptop/LaptopSave.h

@@ -125,13 +125,6 @@ typedef struct
 	BOOLEAN							fSpeckSaidFloMarriedCousinQuote;
 	BOOLEAN							fHasAMercDiedAtMercSite;
 
-#ifdef JA2UB
-#else
-	UINT32							uiJohnEscortedDate;// anv: Remember when Kulbas were escorted out, so John can be recruited later
-	BOOLEAN							bJohnEscorted;// and if they were at all
-	UINT8							ubJohnPossibleMissedFlights;// and how many flights he already missed
-#endif
-
 #ifdef CRIPPLED_VERSION
 	UINT8 ubCrippleFiller[20];
 #endif
@@ -167,7 +160,13 @@ typedef struct
 	UINT32							uiTotalMoneyPaidToSpeck;
 
 	UINT8								ubLastMercAvailableId;
-	UINT8 bPadding[ 86 ];
+
+	// Flugente: moved here. These variables always exist, as havin #ifdefs in structs is needlessly obscure
+	UINT32							uiJohnEscortedDate;// anv: Remember when Kulbas were escorted out, so John can be recruited later
+	BOOLEAN							bJohnEscorted;// and if they were at all
+	UINT8							ubJohnPossibleMissedFlights;// and how many flights he already missed
+
+	UINT8 bPadding[ 77 ];			// Flugente: 86->77
 
 } LaptopSaveInfoStruct;