ExtraDepletionBehavior

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

@@ -914,6 +914,25 @@ class Inventory : Actor
 		}
 	}
 
+	//===========================================================================
+	//
+	// Inventory :: DepleteBy
+	//
+	// Handles item depletion when using or taking items
+	//
+	//===========================================================================
+	virtual void DepleteBy(int by)
+	{
+		if (!amount || by >= amount)
+		{
+			DepleteOrDestroy();
+		}
+		else
+		{
+			amount -= by;
+		}
+	}
+
 	//===========================================================================
 	//
 	// Inventory :: DepleteOrDestroy

wadsrc/static/zscript/actors/inventory_util.zs

@@ -146,11 +146,7 @@ extend class Actor
 
 		if (!fromdecorate)
 		{
-			item.Amount -= amount;
-			if (item.Amount <= 0)
-			{
-				item.DepleteOrDestroy();
-			}
+			item.DepleteBy(amount);
 			// It won't be used in non-decorate context, so return false here
 			return false;
 		}
@@ -163,17 +159,18 @@ extend class Actor
 
 		// Do not take ammo if the "no take infinite/take as ammo depletion" flag is set
 		// and infinite ammo is on
+		// Alternatively do not take customInventory items if sv_infiniteinventory is true
 		if (notakeinfinite &&
-		(sv_infiniteammo || (player && FindInventory('PowerInfiniteAmmo', true))) && (item is 'Ammo'))
+		(sv_infiniteammo || (player && FindInventory('PowerInfiniteAmmo', true))) && (item is 'Ammo')
+		|| sv_infiniteinventory && item is 'CustomInventory')
 		{
 			// Nothing to do here, except maybe res = false;? Would it make sense?
 			result = false;
 		}
-		else if (!amount || amount >= item.Amount)
+		else
 		{
-			item.DepleteOrDestroy();
+			item.DepleteBy(amount);
 		}
-		else item.Amount -= amount;
 
 		return result;
 	}
@@ -271,10 +268,9 @@ extend class Actor
 		{
 			return true;
 		}
-
-		if (--item.Amount <= 0)
+		else
 		{
-			item.DepleteOrDestroy ();
+			item.DepleteBy(1); //useinventory can only really use one item at a time
 		}
 		return true;
 	}