From 41b592f19c101d51423b23190d9ee4f4affedeea Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Fri, 26 Mar 2021 08:08:26 +0100
Subject: [PATCH] Fix punch use achievement double increment. Fix division by
 zero.

---
 language.version                          | 4 ++--
 zscript/hud/swwm_hudextra.zsc             | 1 +
 zscript/weapons/swwm_baseweapon_melee.zsc | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/language.version b/language.version
index 57d00fda5..dc6af528f 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r413 \cu(Fri 26 Mar 03:21:12 CET 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r413 \cu(2021-03-26 03:21:12)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r414 \cu(Fri 26 Mar 08:08:26 CET 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r414 \cu(2021-03-26 08:08:26)\c-";
diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc
index b769a444a..a60854e25 100644
--- a/zscript/hud/swwm_hudextra.zsc
+++ b/zscript/hud/swwm_hudextra.zsc
@@ -202,6 +202,7 @@ Class SWWMAchievementNotification : HUDMessageBase
 		Vector2 hs;
 		if ( swwm_hudscale <= 0 ) hs = StatusBar.GetHUDScale();
 		else hs.x = swwm_hudscale;
+		hs.y = hs.x;
 		Vector2 ss = (Screen.GetWidth()/hs.x,Screen.GetHeight()/hs.y);
 		double alpha = (tics<fadeintics)?(tics/fadeintics):(tics<(fadeintics+holdtics))?1.:(1.-(tics-(fadeintics+holdtics))/fadeouttics);
 		Vector2 pos = (int(ss.x-256)/2,(ss.y-(margin+36))+int(margin+40)*(1.-alpha));
diff --git a/zscript/weapons/swwm_baseweapon_melee.zsc b/zscript/weapons/swwm_baseweapon_melee.zsc
index 07c9f3830..22d58ba67 100644
--- a/zscript/weapons/swwm_baseweapon_melee.zsc
+++ b/zscript/weapons/swwm_baseweapon_melee.zsc
@@ -391,10 +391,7 @@ extend Class SWWMWeapon
 			{
 				int locknum = SWWMUtility.GetLineLock(ut.uses[i].hitline);
 				if ( !locknum || CheckKeys(locknum,false,true) )
-				{
-					SWWMUtility.AchievementProgressInc('swwm_progress_slemg',1,player);
 					ut.uses[i].hitline.RemoteActivate(self,ut.uses[i].hitside,SPAC_Use,ut.uses[i].pos);
-				}
 				if ( !(ut.uses[i].hitline.activation&SPAC_UseThrough) ) break;
 			}
 		}