Fixed local copies of items not respecting their Amount value

ZDoom · Apr 21, 2024 · 10a8a61 · 10a8a61
1 parent c3b9dd7
commit 10a8a61
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/wadsrc/static/zscript/actors/inventory/inventory.zs b/wadsrc/static/zscript/actors/inventory/inventory.zs
@@ -414,7 +414,10 @@ class Inventory : Actor
 	{
 		Inventory copy;
 
-		Amount = MIN(Amount, MaxAmount);
+		// Clamping this on local copy creation presents too many possible
+		// pitfalls (e.g. Health items).
+		if (!IsCreatingLocalCopy())
+			Amount = MIN(Amount, MaxAmount);
 		if (GoAway ())
 		{
 			copy = Inventory(Spawn (GetClass()));
@@ -1046,7 +1049,7 @@ class Inventory : Actor
 
 	protected bool GoAway ()
 	{
-		if (bCreatingCopy)
+		if (IsCreatingLocalCopy())
 			return true;
 
 		// Dropped items never stick around
@@ -1130,6 +1133,11 @@ class Inventory : Actor
 
 		return item;
 	}
+
+	protected clearscope bool IsCreatingLocalCopy() const
+	{
+		return bCreatingCopy;
+	}
 
 	//===========================================================================
 	//