From 6be8a2f209ee5ded4e94a078b2788a2a16b9a1fd Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Wed, 1 Dec 2021 01:22:44 +0100
Subject: [PATCH] Tiny cleanup.

---
 language.version                |  4 ++--
 zscript/items/swwm_baseammo.zsc | 17 -----------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/language.version b/language.version
index 8d9de164c..558f76aef 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r65 \cu(Wed  1 Dec 01:10:07 CET 2021)\c-";
-SWWM_SHORTVER="\cw1.2pre r65 \cu(2021-12-01 01:10:07)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r66 \cu(Wed  1 Dec 01:22:44 CET 2021)\c-";
+SWWM_SHORTVER="\cw1.2pre r66 \cu(2021-12-01 01:22:44)\c-";
diff --git a/zscript/items/swwm_baseammo.zsc b/zscript/items/swwm_baseammo.zsc
index 35f953cb3..25ef5a965 100644
--- a/zscript/items/swwm_baseammo.zsc
+++ b/zscript/items/swwm_baseammo.zsc
@@ -207,17 +207,6 @@ Class SWWMAmmo : Ammo
 		return Super.HandlePickup(item);
 	}
 
-	override void DoEffect()
-	{
-		Super.DoEffect();
-		// drop excess ammo
-		if ( !sv_infiniteammo && !Owner.FindInventory('PowerInfiniteAmmo') )
-		{
-			int excess = Amount-MaxAmount;
-			if ( excess > 0 ) CreateTossable(excess);
-		}
-	}
-
 	override bool CanPickup( Actor toucher )
 	{
 		// don't allow picking up ammo for weapons we can't pick up
@@ -486,12 +475,6 @@ Class MagAmmo : Inventory abstract
 	override void DoEffect()
 	{
 		Super.DoEffect();
-		// drop excess ammo
-		if ( !sv_infiniteammo && !Owner.FindInventory('PowerInfiniteAmmo') )
-		{
-			int excess = Amount-MaxAmount;
-			if ( excess > 0 ) CreateTossable(excess);
-		}
 		if ( !pamo )
 		{
 			pamo = Ammo(Owner.FindInventory(ParentAmmo));