From 3da96ba3f11910440755a03f66cbc9591d65d80c Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Thu, 11 Aug 2022 16:44:07 +0200
Subject: [PATCH] Fix third person animations.

---
 language.version                 | 4 ++--
 models/modelnotes.txt            | 2 +-
 zscript/dlc1/swwm_hammertime.zsc | 9 +++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/language.version b/language.version
index fe40f92a5..562329f7f 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r299 \cu(Thu 11 Aug 16:34:11 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r299 \cu(2022-08-11 16:34:11)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r301 \cu(Thu 11 Aug 16:44:29 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r301 \cu(2022-08-11 16:44:29)\c-";
diff --git a/models/modelnotes.txt b/models/modelnotes.txt
index 8987eaacd..be355c54f 100644
--- a/models/modelnotes.txt
+++ b/models/modelnotes.txt
@@ -1,7 +1,7 @@
 # DLC Weaponset
 
 Weapon models:
- ½ Itamex Hammer
+ x Itamex Hammer
  - Plasma Blaster
  - Puntzer Beta
  - Puntzer Gamma
diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc1/swwm_hammertime.zsc
index 57dfb94c9..809639b56 100644
--- a/zscript/dlc1/swwm_hammertime.zsc
+++ b/zscript/dlc1/swwm_hammertime.zsc
@@ -78,6 +78,7 @@ Class ItamexHammer : SWWMWeapon
 		[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
 		SWWMUtility.DoKnockback(self,(cos(angle),sin(angle),.004),3000.*invoker.charge);
 		A_QuakeEx(1,1,1,15,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.1);
+		A_PlayerFire();
 		invoker.spintime++;
 		if ( invoker.hitcnt > 0 ) invoker.hitcnt--;
 		else if ( A_Melee(int(80+invoker.charge*1.2),"itamex/hit",2.5,2.,3.,MELEE_Rip|MELEE_FleshSound|MELEE_ExtraWide|MELEE_HammerHit) )
@@ -200,7 +201,11 @@ Class ItamexHammer : SWWMWeapon
 		XZW2 A 2 A_StartSound("itamex/meleestart",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW6 XYZ 2;
 		XZW7 ABCDEF 2;
-		XZW7 G 1 A_StartSound("itamex/meleeend",CHAN_WEAPONEXTRA,pitch:.7,starttime:.2);
+		XZW7 G 1
+		{
+			A_PlayerCheckGun();
+			A_StartSound("itamex/meleeend",CHAN_WEAPONEXTRA,pitch:.7,starttime:.2);
+		}
 		XZW7 HIJ 1;
 		XZW7 K 1 A_StartSound("itamex/meleeend",CHAN_WEAPONEXTRA,pitch:.8,starttime:.2);
 		XZW7 LMNO 1;
@@ -221,7 +226,7 @@ Class ItamexHammer : SWWMWeapon
 		XZW8 R 1
 		{
 			A_Parry(9);
-			A_PlayerMelee();
+			A_PlayerMelee(true);
 		}
 		XZW8 S 1;
 		XZW8 T 3 A_Melee(50,"demolitionist/whitm",1.2,1.4);