From 9242b972c9517c3d05c67441b08e2464288fab3b Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 6 Jun 2014 00:41:53 +0000
Subject: [PATCH] Fix: dynamic opinion data was not cleared correctly upon
 starting a new game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Soldier Control.cpp | 2 ++
 Tactical/Soldier Profile.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp
index 4ca0bdd6..a354dc12 100644
--- a/Tactical/Soldier Control.cpp	
+++ b/Tactical/Soldier Control.cpp	
@@ -1541,6 +1541,8 @@ void MERCPROFILESTRUCT::initialize()
 	// SANDRO - added this
 	memset( &records, 0, sizeof(STRUCT_Records) );
 	memset( &usBackground, 0, sizeof(UINT16) );
+
+	memset( &usDynamicOpinionFlagmask, 0, sizeof(usDynamicOpinionFlagmask) );
 }
 
 // Initialize the soldier.
diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp
index ee223621..c234f996 100644
--- a/Tactical/Soldier Profile.cpp	
+++ b/Tactical/Soldier Profile.cpp	
@@ -795,8 +795,6 @@ BOOLEAN LoadMercProfiles(void)
 			FileClose( fptr );
 			return(FALSE);
 		}
-
-		
 		
 		// WANNE: For the new WF merc, there is no entry in prof.dat, so we have to reset some flags manually!		
 		if (uiLoop >= 170)
@@ -807,6 +805,10 @@ BOOLEAN LoadMercProfiles(void)
 
 			gMercProfiles[uiLoop].uiTotalCostToDate = 0;
 			gMercProfiles[uiLoop].iMercMercContractLength = 0;
+
+			gMercProfiles[uiLoop].usBackground = 0;
+
+			memset( &gMercProfiles[uiLoop].usDynamicOpinionFlagmask, 0, sizeof(gMercProfiles[uiLoop].usDynamicOpinionFlagmask) );
 		}
 
 		// WANNE - BMP: DONE!