From b90a3c91b918a00f766eff9ed2ebadacf535a85a Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 21 Feb 2021 20:45:03 +0100
Subject: [PATCH] Fix COUNTITEM handling of Hammerspace Embiggener.

---
 language.version      | 4 ++--
 zscript/swwm_ammo.zsc | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/language.version b/language.version
index 7edd1f04d..067492ca0 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r293 \cu(Sun 21 Feb 18:01:02 CET 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r293 \cu(2021-02-21 18:01:02)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r294 \cu(Sun 21 Feb 20:45:03 CET 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r294 \cu(2021-02-21 20:45:03)\c-";
diff --git a/zscript/swwm_ammo.zsc b/zscript/swwm_ammo.zsc
index ae25a9532..6e4802307 100644
--- a/zscript/swwm_ammo.zsc
+++ b/zscript/swwm_ammo.zsc
@@ -1750,6 +1750,7 @@ Class HammerspaceEmbiggener : Inventory
 		{
 			if ( !GoAway() ) Destroy();
 			let copy = Inventory(Spawn('HammerspaceEmbiggener'));
+			copy.ClearCounters();
 			copy.Amount = self.Amount;
 			copy.MaxAmount = self.MaxAmount;
 			return copy;
@@ -1757,6 +1758,7 @@ Class HammerspaceEmbiggener : Inventory
 		if ( GoAway() )
 		{
 			let copy = Inventory(Spawn(GetClass()));
+			copy.ClearCounters();
 			copy.Amount = self.Amount;
 			copy.MaxAmount = self.MaxAmount;
 			return copy;
@@ -1828,6 +1830,7 @@ Class HammerspaceEmbiggener : Inventory
 			let t = bt.Thing;
 			if ( !t || (t == self) || !(t is 'HammerspaceEmbiggener') || !(t.spawnpoint ~== spawnpoint) ) continue;
 			tamount += HammerspaceEmbiggener(t).Amount;
+			t.ClearCounters();
 			t.Destroy();
 		}
 		if ( tamount <= 1 ) return;
@@ -1858,6 +1861,7 @@ Class HammerspaceEmbiggener : Inventory
 		n.tracer = tracer;
 		n.target = target;
 		if ( !bDROPPED ) n.bDROPPED = false;
+		ClearCounters();
 		Destroy();
 	}