From a3426518425a6250cca105063f2cc15801b82f63 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Sat, 14 Jan 2023 19:19:08 +0100
Subject: [PATCH] Revert IsActorPlayingSound hotfix, not needed in this branch.

---
 language.version                                  | 4 ++--
 zscript/handler/swwm_handler_oneliners.zsc        | 2 +-
 zscript/items/swwm_funstuff.zsc                   | 2 +-
 zscript/items/swwm_powerups_vip.zsc               | 2 +-
 zscript/weapons/swwm_deathlydeathcannon_altfx.zsc | 4 ++--
 zscript/weapons/swwm_deathlydeathcannon_fx.zsc    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/language.version b/language.version
index 924f563f6..b0b99d60f 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r733 \cu(Sat 14 Jan 19:14:39 CET 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r733 \cu(2023-01-14 19:14:39)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r734 \cu(Sat 14 Jan 19:19:08 CET 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r734 \cu(2023-01-14 19:19:08)\c-";
diff --git a/zscript/handler/swwm_handler_oneliners.zsc b/zscript/handler/swwm_handler_oneliners.zsc
index 1eb9ffd26..5d59dbb98 100644
--- a/zscript/handler/swwm_handler_oneliners.zsc
+++ b/zscript/handler/swwm_handler_oneliners.zsc
@@ -23,7 +23,7 @@ extend Class SWWMHandler
 		if ( players[consoleplayer].mo.FindInventory("RagekitPower") && (type != "ragekit") ) return 0;
 		// suppress beep-boop lines if voice channel already in use
 		if ( ((type == "buttonpush") || (type == "mrtouch") || (type == "mrflick"))
-			&& players[consoleplayer].mo.IsActorPlayingSound(CHAN_DEMOVOICE,-1)
+			&& players[consoleplayer].mo.IsActorPlayingSound(CHAN_DEMOVOICE)
 			&& !players[consoleplayer].mo.IsActorPlayingSound(CHAN_DEMOVOICE,"voice/default/buttonpush1")
 			&& !players[consoleplayer].mo.IsActorPlayingSound(CHAN_DEMOVOICE,"voice/default/buttonpush2")
 			&& !players[consoleplayer].mo.IsActorPlayingSound(CHAN_DEMOVOICE,"voice/default/buttonpush3")
diff --git a/zscript/items/swwm_funstuff.zsc b/zscript/items/swwm_funstuff.zsc
index c9a11d096..1b2700017 100644
--- a/zscript/items/swwm_funstuff.zsc
+++ b/zscript/items/swwm_funstuff.zsc
@@ -626,7 +626,7 @@ Class PartyTime : SWWMNonInteractiveActor
 		if ( ignite )
 		{
 			// wait for the sound to stop
-			if ( !IsActorPlayingSound(CHAN_ITEM,-1) )
+			if ( !IsActorPlayingSound(CHAN_ITEM) )
 				Destroy();
 			return;
 		}
diff --git a/zscript/items/swwm_powerups_vip.zsc b/zscript/items/swwm_powerups_vip.zsc
index ca5289af3..4bb823595 100644
--- a/zscript/items/swwm_powerups_vip.zsc
+++ b/zscript/items/swwm_powerups_vip.zsc
@@ -452,7 +452,7 @@ Class MykradvoBurst : SWWMNonInteractiveActor
 	{
 	Spawn:
 		XEX4 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\ 2 Bright;
-		TNT1 A 1 A_JumpIf(!IsActorPlayingSound(CHAN_VOICE,-1)&&!(targets.Size()),1);
+		TNT1 A 1 A_JumpIf(!IsActorPlayingSound(CHAN_VOICE)&&!(targets.Size()),1);
 		Wait;
 		TNT1 A 1;
 		Stop;
diff --git a/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc b/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc
index 953b049cb..b72b0edb2 100644
--- a/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc
+++ b/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc
@@ -1265,7 +1265,7 @@ Class YnykronSingularity : SWWMNonInteractiveActor
 		special1++;
 		if ( special1 > 60 )
 		{
-			if ( IsActorPlayingSound(CHAN_VOICE,-1) ) return;
+			if ( IsActorPlayingSound(CHAN_VOICE) ) return;
 			for ( int i=0; i<MAXBEAMS; i++ ) if ( beamers[i] ) return;
 			Destroy();
 			return;
@@ -1512,7 +1512,7 @@ Class YnykronAltShot : SWWMNonInteractiveActor
 			freezetics--;
 			return;
 		}
-		if ( isFrozen() || IsActorPlayingSound(CHAN_VOICE,-1) ) return;
+		if ( isFrozen() || IsActorPlayingSound(CHAN_VOICE) ) return;
 		Destroy();
 	}
 }
diff --git a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
index 1c0e61e1b..eff3cda7e 100644
--- a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
+++ b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
@@ -1081,7 +1081,7 @@ Class YnykronShot : SWWMNonInteractiveActor
 			SWWMUtility.AchievementProgress("ezkill",enemykills,target.player);
 			enemykills = 0;
 		}
-		if ( IsActorPlayingSound(CHAN_VOICE,-1) )
+		if ( IsActorPlayingSound(CHAN_VOICE) )
 			return;
 		// we're done here
 		Destroy();