Fixed local items not copying properties properly

Author: Boondorl

wadsrc/static/zscript/actors/hexen/flechette.zs

@@ -246,12 +246,12 @@ class ArtiPoisonBag : Inventory
 	//
 	//============================================================================
 
-	override Inventory CreateCopy (Actor other)
+	override Inventory CreateCopy (Actor other, bool force)
 	{
 		// Only the base class gets special handling
 		if (GetClass() != "ArtiPoisonBag")
 		{
-			return Super.CreateCopy (other);
+			return Super.CreateCopy (other, force);
 		}
 
 		class<Actor> spawntype = GetFlechetteType(other);

wadsrc/static/zscript/actors/inventory/ammo.zs

@@ -132,7 +132,7 @@ class Ammo : Inventory
 	//
 	//===========================================================================
 
-	override Inventory CreateCopy (Actor other)
+	override Inventory CreateCopy (Actor other, bool force)
 	{
 		Inventory copy;
 		int amount = Amount;
@@ -157,7 +157,7 @@ class Ammo : Inventory
 		}
 		else
 		{
-			copy = Super.CreateCopy (other);
+			copy = Super.CreateCopy (other, force);
 			copy.Amount = amount;
 		}
 		if (copy.Amount > copy.MaxAmount)
@@ -242,7 +242,7 @@ class BackpackItem : Inventory
 	//
 	//===========================================================================
 
-	override Inventory CreateCopy (Actor other)
+	override Inventory CreateCopy (Actor other, bool force)
 	{
 		// Find every unique type of ammoitem. Give it to the player if
 		// he doesn't have it already, and double its maximum capacity.
@@ -292,7 +292,7 @@ class BackpackItem : Inventory
 				}
 			}
 		}
-		return Super.CreateCopy (other);
+		return Super.CreateCopy (other, force);
 	}
 
 	//===========================================================================

wadsrc/static/zscript/actors/inventory/armor.zs

@@ -247,9 +247,9 @@ class BasicArmorBonus : Armor
 	//
 	//===========================================================================
 
-	override Inventory CreateCopy (Actor other)
+	override Inventory CreateCopy (Actor other, bool force)
 	{
-		let copy = BasicArmorBonus(Super.CreateCopy (other));
+		let copy = BasicArmorBonus(Super.CreateCopy (other, force));
 		copy.SavePercent = SavePercent;
 		copy.SaveAmount = SaveAmount;
 		copy.MaxSaveAmount = MaxSaveAmount;
@@ -366,9 +366,9 @@ class BasicArmorPickup : Armor
 	//
 	//===========================================================================
 
-	override Inventory CreateCopy (Actor other)
+	override Inventory CreateCopy (Actor other, bool force)
 	{
-		let copy = BasicArmorPickup(Super.CreateCopy (other));
+		let copy = BasicArmorPickup(Super.CreateCopy (other, force));
 		copy.SavePercent = SavePercent;
 		copy.SaveAmount = SaveAmount;
 		copy.MaxAbsorb = MaxAbsorb;

wadsrc/static/zscript/actors/inventory/health.zs

@@ -133,9 +133,9 @@ class HealthPickup : Inventory
 	//
 	//===========================================================================
 
-	override Inventory CreateCopy (Actor other)
+	override Inventory CreateCopy (Actor other, bool force)
 	{
-		Inventory copy = Super.CreateCopy (other);
+		Inventory copy = Super.CreateCopy (other, force);
 		copy.health = health;
 		return copy;
 	}

wadsrc/static/zscript/actors/inventory/inventory.zs

@@ -409,12 +409,13 @@ class Inventory : Actor
 	//
 	//===========================================================================
 
-	virtual Inventory CreateCopy (Actor other)
+	virtual Inventory CreateCopy (Actor other, bool force = false)
 	{
 		Inventory copy;
-
-		Amount = MIN(Amount, MaxAmount);
-		if (GoAway ())
+		if (!force)
+			Amount = MIN(Amount, MaxAmount);
+			
+		if (force || GoAway ())
 		{
 			copy = Inventory(Spawn (GetClass()));
 			copy.Amount = Amount;
@@ -835,7 +836,7 @@ class Inventory : Actor
 		Inventory give = self;
 		if (localPickUp)
 		{
-			give = Inventory(Spawn(GetClass()));
+			give = CreateCopy(toucher, true);
 			if (!give)
 				return;
 		}

wadsrc/static/zscript/actors/inventory/weapons.zs

@@ -660,9 +660,9 @@ class Weapon : StateProvider
 	//
 	//===========================================================================
 
-	override Inventory CreateCopy (Actor other)
+	override Inventory CreateCopy (Actor other, bool force)
 	{
-		let copy = Weapon(Super.CreateCopy (other));
+		let copy = Weapon(Super.CreateCopy (other, force));
 		if (copy != self && copy != null)
 		{
 			copy.AmmoGive1 = AmmoGive1;

wadsrc/static/zscript/actors/strife/coin.zs

@@ -58,11 +58,11 @@ class Coin : Inventory
 		return false;
 	}
 
-	override Inventory CreateCopy (Actor other)
+	override Inventory CreateCopy (Actor other, bool force)
 	{
 		if (GetClass() == "Coin")
 		{
-			return Super.CreateCopy (other);
+			return Super.CreateCopy (other, force);
 		}
 		Inventory copy = Inventory(Spawn("Coin"));
 		copy.Amount = Amount;