- 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;
 

Laptop/laptop.cpp

@@ -825,13 +825,10 @@ BOOLEAN InitLaptopAndLaptopScreens()
 	#endif
 	LaptopSaveInfo.fBobbyRSiteCanBeAccessed = FALSE;
 
-#ifdef JA2UB
-#else
 	//Reset Kulbas' saving date and possible missed flights
 	LaptopSaveInfo.bJohnEscorted = FALSE;
 	LaptopSaveInfo.uiJohnEscortedDate = 0;
 	LaptopSaveInfo.ubJohnPossibleMissedFlights = 3;
-#endif
 
 	return( TRUE );
 }

Laptop/mercs.cpp

@@ -2616,15 +2616,12 @@ void HandleSpeckWitnessingEmployeeDeath( SOLDIERTYPE* pSoldier )  // anv: handle
 
 #endif
 
-#ifdef JA2UB
+void AddJohnAsMerc() // anv: add John as playable merc after escorting Kulbas out of country
-#else
+{
-	void AddJohnAsMerc() // anv: add John as playable merc after escorting Kulbas out of country
+	LaptopSaveInfo.bJohnEscorted = TRUE;
-	{
+	LaptopSaveInfo.uiJohnEscortedDate = GetWorldDay();
-		LaptopSaveInfo.bJohnEscorted = TRUE;
+	return;
-		LaptopSaveInfo.uiJohnEscortedDate = GetWorldDay();
+}
-		return;
-	}
-#endif
 
 BOOLEAN ShouldSpeckSayAQuote()
 {
@@ -2817,7 +2814,7 @@ BOOLEAN ShouldTheMercSiteServerGoDown()
 #else
 void GetMercSiteBackOnline()
 {
-	if( IsSpeckComAvailable )
+	if( IsSpeckComAvailable() )
 	{
 		//Add an email telling the user the site is back up
 		AddEmail( MERC_NEW_SITE_ADDRESS, MERC_NEW_SITE_ADDRESS_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1 , TYPE_EMAIL_EMAIL_EDT);

Laptop/mercs.h

@@ -160,11 +160,11 @@ void MakeBiffAwayForCoupleOfDays();
 #else
 	BOOLEAN IsSpeckComAvailable();
 	void HandleSpeckWitnessingEmployeeDeath( SOLDIERTYPE* pSoldier );
-	
-	// anv: for Kulba hireable after escort quest
-	void AddJohnAsMerc( );
 #endif
 
+// anv: for Kulba hireable after escort quest
+void AddJohnAsMerc( );
+
 void InitializeNumDaysMercArrive();
 
 void NewMercsAvailableAtMercSiteCallBack( );