From 098191dcc659238124e2a84a4966f7709d729f2d Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Sat, 1 Jul 2023 14:28:00 +0200
Subject: [PATCH] Fix for some weapon pickups "twitching".

---
 language.version                    | 4 ++--
 zscript/weapons/swwm_sparkyboi.zsc  | 8 ++++++--
 zscript/weapons/swwm_tastytreat.zsc | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/language.version b/language.version
index 7a410922b..656022603 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r819 \cu(Sat  1 Jul 14:18:38 CEST 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r819 \cu(2023-07-01 14:18:38)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r820 \cu(Sat  1 Jul 14:28:00 CEST 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r820 \cu(2023-07-01 14:28:00)\c-";
diff --git a/zscript/weapons/swwm_sparkyboi.zsc b/zscript/weapons/swwm_sparkyboi.zsc
index 03efe52c2..07210698e 100644
--- a/zscript/weapons/swwm_sparkyboi.zsc
+++ b/zscript/weapons/swwm_sparkyboi.zsc
@@ -149,6 +149,11 @@ Class Sparkster : SWWMWeapon
 		A_StartSound("biospark/fail",CHAN_WEAPON,CHANF_OVERLAP);
 	}
 
+	action void A_UpdatePickup()
+	{
+		frame = invoker.doublestacc;
+	}
+
 	override void MarkPrecacheSounds()
 	{
 		Super.MarkPrecacheSounds();
@@ -224,8 +229,7 @@ Class Sparkster : SWWMWeapon
 	States
 	{
 	Spawn:
-		XZW1 A -1 NoDelay A_JumpIf(invoker.doublestacc,1);
-		XZW1 B -1;
+		XZW1 A -1 NoDelay A_UpdatePickup();
 		Stop;
 	Select:
 		XZW2 G 2
diff --git a/zscript/weapons/swwm_tastytreat.zsc b/zscript/weapons/swwm_tastytreat.zsc
index 6c38768f5..cd8639fe2 100644
--- a/zscript/weapons/swwm_tastytreat.zsc
+++ b/zscript/weapons/swwm_tastytreat.zsc
@@ -325,7 +325,7 @@ Class CandyGun : SWWMWeapon
 			CandyGun(spare).AmmoGive1 = 0;
 			CandyGun(spare).clipcount = 0;
 			CandyGun(spare).chambered = false;
-			spare.SetState(spare.SpawnState+1);
+			spare.frame = 1;
 			spare.DropTime = 30;
 			spare.bSpecial = spare.bSolid = false;
 			Ammo2.Amount--;
@@ -334,7 +334,7 @@ Class CandyGun : SWWMWeapon
 		swapdrop = false;
 		let drop = Super.CreateTossable(amt);
 		if ( (drop == self) && (clipcount <= 0) && !chambered )
-			SetState(SpawnState+2);
+			frame = 2;
 		return drop;
 	}
 
@@ -378,7 +378,7 @@ Class CandyGun : SWWMWeapon
 	States
 	{
 	Spawn:
-		XZW1 ABC -1;
+		XZW1 A -1;
 		Stop;
 	Select:
 		XZW2 B 2