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
This commit is contained in:
Flugente
2014-06-06 00:41:53 +00:00
parent f5e94e869a
commit 9242b972c9
2 changed files with 6 additions and 2 deletions
+2
View File
@@ -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.
+4 -2
View File
@@ -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!