mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
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
This commit is contained in:
@@ -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!
|
// WANNE: For the new WF merc, there is no entry in prof.dat, so we have to reset some flags manually!
|
||||||
if (uiLoop >= 170)
|
if (uiLoop >= 170)
|
||||||
{
|
{
|
||||||
gMercProfiles[uiLoop].ubMiscFlags = 0;
|
gMercProfiles[uiLoop].initialize();
|
||||||
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) );
|
|
||||||
|
|
||||||
// Flugente: as this data is not in the xml, we set dummy values
|
// Flugente: as this data is not in the xml, we set dummy values
|
||||||
if ( gMercProfiles[uiLoop].ubApproachVal[0] == 0 &&
|
if ( gMercProfiles[uiLoop].ubApproachVal[0] == 0 &&
|
||||||
gMercProfiles[uiLoop].ubApproachVal[1] == 0 &&
|
gMercProfiles[uiLoop].ubApproachVal[1] == 0 &&
|
||||||
|
|||||||
Reference in New Issue
Block a user