Restore packed item state when regenerating an item using heroitem data

diasurgical · Sep 4, 2023 · 9b9cab5 · 9b9cab5
1 parent 49c5aea
commit 9b9cab5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
@@ -969,6 +969,14 @@ void LoadMatchingItems(LoadHelper &file, const Player &player, const int n, Item
 			if ((heroItem.dwBuff & CF_HELLFIRE) != (unpackedItem.dwBuff & CF_HELLFIRE)) {
 				unpackedItem = {};
 				RecreateItem(player, unpackedItem, heroItem.IDidx, heroItem._iCreateInfo, heroItem._iSeed, heroItem._ivalue, (heroItem.dwBuff & CF_HELLFIRE) != 0);
+				unpackedItem._iIdentified = heroItem._iIdentified;
+				unpackedItem._iMaxDur = heroItem._iMaxDur;
+				unpackedItem._iDurability = ClampDurability(unpackedItem, heroItem._iDurability);
+				unpackedItem._iMaxCharges = std::clamp<int>(heroItem._iMaxCharges, 0, unpackedItem._iMaxCharges);
+				unpackedItem._iCharges = std::clamp<int>(heroItem._iCharges, 0, unpackedItem._iMaxCharges);
+				RemoveInvalidItem(unpackedItem);
+				if (unpackedItem.isEmpty())
+					continue;
 			}
 			if (!IsShopPriceValid(unpackedItem)) {
 				unpackedItem.clear();

diff --git a/Source/pack.cpp b/Source/pack.cpp
@@ -407,13 +407,7 @@ void UnPackItem(const ItemPack &packedItem, const Player &player, Item &item, bo
 		item._iDurability = ClampDurability(item, packedItem.bDur);
 		item._iMaxCharges = std::clamp<int>(packedItem.bMCh, 0, item._iMaxCharges);
 		item._iCharges = std::clamp<int>(packedItem.bCh, 0, item._iMaxCharges);
-
 		RemoveInvalidItem(item);
-
-		if (isHellfire)
-			item.dwBuff |= CF_HELLFIRE;
-		else
-			item.dwBuff &= ~CF_HELLFIRE;
 	}
 }