From d757ef71b64e3b03569263535ed7f3b1f1db02a9 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Tue, 25 May 2021 03:45:19 +0000 Subject: [PATCH] fixed some of the merc stats like kills and progress of stats/level increase not being resetted when starting a new game after some previous gameplay was loaded initially git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9046 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Profile.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp index cdfff67e4..63bb19596 100644 --- a/Tactical/Soldier Profile.cpp +++ b/Tactical/Soldier Profile.cpp @@ -648,20 +648,8 @@ BOOLEAN LoadMercProfiles(void) // WANNE: For the new WF merc, there is no entry in prof.dat, so we have to reset some flags manually! if (uiLoop >= 170) { - gMercProfiles[uiLoop].ubMiscFlags = 0; - gMercProfiles[uiLoop].ubMiscFlags2 = 0; - gMercProfiles[uiLoop].ubMiscFlags3 = 0; - - gMercProfiles[uiLoop].uiTotalCostToDate = 0; - gMercProfiles[uiLoop].iMercMercContractLength = 0; - - gMercProfiles[uiLoop].usBackground = 0; - gMercProfiles[uiLoop].Type = PROFILETYPE_NONE; - - memset( &gMercProfiles[uiLoop].usDynamicOpinionFlagmask, 0, sizeof(gMercProfiles[uiLoop].usDynamicOpinionFlagmask) ); - - memset( &gMercProfiles[uiLoop].sDynamicOpinionLongTerm, 0, sizeof(gMercProfiles[uiLoop].sDynamicOpinionLongTerm) ); - + gMercProfiles[uiLoop].initialize(); + // Flugente: as this data is not in the xml, we set dummy values if ( gMercProfiles[uiLoop].ubApproachVal[0] == 0 && gMercProfiles[uiLoop].ubApproachVal[1] == 0 &&