From cd6f731b4df7eb8579db0da2b68656e5fbb3443b Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 15 Jul 2013 22:34:18 +0000
Subject: [PATCH] Fix: merc records get erased when restarting the exe.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6233 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 SaveLoadGame.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp
index 939aeec5..31b56d43 100644
--- a/SaveLoadGame.cpp
+++ b/SaveLoadGame.cpp
@@ -5950,6 +5950,8 @@ BOOLEAN SaveMercProfiles( HWFILE hFile )
 
 BOOLEAN	LoadSavedMercProfiles( HWFILE hFile )
 {
+	// Flugente 2013-07-16: This code erases merc records on loading. I am thus commenting it out until someone fixes it.
+#if 0
 	UINT16	cnt;
 	MERCPROFILESTRUCT tempMercProfile;
 	//Loop through all the profiles to Load
@@ -5973,6 +5975,22 @@ BOOLEAN	LoadSavedMercProfiles( HWFILE hFile )
 			return(FALSE);
 		}*/
 	}
+#endif
+
+	UINT16	cnt;
+	//Loop through all the profiles to Load
+	for( cnt=0; cnt< NUM_PROFILES; cnt++)
+	{
+		// At some point after STOMP12_SAVEGAME_DATATYPE_CHANGE, NUM_PROFILES was changed from NUM_PROFILES_v111
+		if(guiCurrentSaveGameVersion < STOMP12_SAVEGAME_DATATYPE_CHANGE && cnt >= NUM_PROFILES_v111)
+			break;
+		// Changed by ADB, rev 1513
+		//if ( !gMercProfiles[cnt].Load(hFile, false) )
+		if ( !gMercProfiles[cnt].Load(hFile, false, false, true) )
+		{
+			return(FALSE);
+		}
+	}
 
 	return( TRUE );
 }