From 4046368bd3e76699621ec0f9922a1c8fd02bcd6d Mon Sep 17 00:00:00 2001 From: Shadooow Date: Sat, 5 Jun 2021 05:53:24 +0000 Subject: [PATCH] fixed more issues when replacing dead/pow IMP char like statistics and attributes progress not being erased, reverted old code git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9062 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/IMP Compile Character.cpp | 9 ++++++--- Laptop/IMP Confirm.cpp | 3 --- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Laptop/IMP Compile Character.cpp b/Laptop/IMP Compile Character.cpp index abd5947c..316a670e 100644 --- a/Laptop/IMP Compile Character.cpp +++ b/Laptop/IMP Compile Character.cpp @@ -119,13 +119,16 @@ BOOLEAN ShouldThisMercHaveABigBody( void ); void CreateACharacterFromPlayerEnteredStats( void ) { - // Kaiden: Seems like as good a place as any to stash this function call to - // ensure that these lists don't get overwritten or Nulled due to the amount - // of changes and revisions that have been made to personalities and attitudes. + // Kaiden: Seems like as good a place as any to stash this function call to + // ensure that these lists don't get overwritten or Nulled due to the amount + // of changes and revisions that have been made to personalities and attitudes. CreatePlayersPersonalitySkillsAndAttitude(); LaptopSaveInfo.iIMPIndex = GetFreeIMPSlot( -1 ); + //shadooow: fixes many old values and items remaining when replacing dead/pow IMP + gMercProfiles[LaptopSaveInfo.iIMPIndex].initialize(); + // copy over full name wcscpy( gMercProfiles[ LaptopSaveInfo.iIMPIndex ].zName, pFullName ); diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp index 396646ff..40340279 100644 --- a/Laptop/IMP Confirm.cpp +++ b/Laptop/IMP Confirm.cpp @@ -604,9 +604,6 @@ void GiveItemsToPC( UINT8 ubProfileId ) pProfile = &(gMercProfiles[ubProfileId]); - //shadooow: fixes mess in inventory when replacing dead/pow IMP - pProfile->clearInventory(); - // Flugente: if necessary, give us the gear we selected if ( IsIMPGearUsed() ) {