From 5824829947c3aa9b38b161bfd9e675cf6a03658d Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 12 Sep 2021 22:41:47 +0200
Subject: [PATCH] Minor fixes

---
 gldefs.misc                              |  4 ++++
 language.def_base                        |  2 +-
 language.version                         |  4 ++--
 zscript/handler/swwm_handler_process.zsc | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/gldefs.misc b/gldefs.misc
index 9bd5a777d..3df446f30 100644
--- a/gldefs.misc
+++ b/gldefs.misc
@@ -82,6 +82,10 @@ HardwareShader Texture "graphics/Fanart/Marisa6.jpg"
 {
 	Shader "shaders/glsl/Bilinear.fp"
 }
+HardwareShader Texture "graphics/Fanart/Marisa7.jpg"
+{
+	Shader "shaders/glsl/Bilinear.fp"
+}
 HardwareShader Texture "graphics/Fanart/RedeadITA.png"
 {
 	Shader "shaders/glsl/Oversample.fp"
diff --git a/language.def_base b/language.def_base
index f9fefd2b9..3438d5212 100644
--- a/language.def_base
+++ b/language.def_base
@@ -90,7 +90,7 @@ T_FCBBULLETS = "1.150 FCB Bullets";
 T_CANDYMAG = "Candy Gun Magazine";
 T_CANDYMAGS = "Candy Gun Magazines";
 T_CANDYBULLET = "Candy Gun Bullet";
-T_CANDYBULLETS = "Candy Gun Bullet";
+T_CANDYBULLETS = "Candy Gun Bullets";
 T_CANDYSPARE = "Candy Gun Spare";
 T_CANDYSPARES = "Candy Gun Spares";
 T_YNYKRONAMMO = "Crystal Box";
diff --git a/language.version b/language.version
index b663cbbea..8d0011cc7 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1pre r16 \cu(Sun 12 Sep 19:09:00 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.1pre r16 \cu(2021-09-12 19:09:00)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1pre r17 \cu(Sun 12 Sep 22:41:47 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.1pre r17 \cu(2021-09-12 22:41:47)\c-";
diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc
index a01ba2f75..fe7196732 100644
--- a/zscript/handler/swwm_handler_process.zsc
+++ b/zscript/handler/swwm_handler_process.zsc
@@ -392,6 +392,15 @@ extend Class SWWMHandler
 					amt = GetDefaultByType(a).Amount;
 				}
 			}
+			if ( item is 'MagAmmo' )
+			{
+				for ( int i=0; i<AllActorClasses.Size(); i++ )
+				{
+					let a = (Class<MagAmmo>)(AllActorClasses[i]);
+					if ( !a || (a.GetParentClass() != item) || (GetDefaultByType(a).Amount < amt) ) continue;
+					amt = GetDefaultByType(a).Amount;
+				}
+			}
 			Inventory ritm = players[e.Args[1]].mo.FindInventory(item);
 			if ( ritm )
 			{
@@ -513,6 +522,15 @@ extend Class SWWMHandler
 					amt = GetDefaultByType(a).Amount;
 				}
 			}
+			if ( i is 'MagAmmo' )
+			{
+				for ( int i=0; i<AllActorClasses.Size(); i++ )
+				{
+					let a = (Class<MagAmmo>)(AllActorClasses[i]);
+					if ( !a || (a.GetParentClass() != item) || (GetDefaultByType(a).Amount < amt) ) continue;
+					amt = GetDefaultByType(a).Amount;
+				}
+			}
 			if ( amt > i.Amount ) amt = i.Amount;
 			let drop = players[e.Args[0]].mo.DropInventory(i,amt);
 			// add some random velocity so multiple drops don't get bunched together