diff --git a/language.version b/language.version index 3930d1349..b825d815d 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r666 \cu(Tue 6 Dec 11:53:51 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r666 \cu(2022-12-06 11:53:51)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r667 \cu(Tue 6 Dec 18:47:26 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r667 \cu(2022-12-06 18:47:26)\c-"; diff --git a/zscript/handler/swwm_handler_oneliners.zsc b/zscript/handler/swwm_handler_oneliners.zsc index 5d59dbb98..1eb9ffd26 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) + && players[consoleplayer].mo.IsActorPlayingSound(CHAN_DEMOVOICE,-1) && !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 fb038f9a9..dfb12e51d 100644 --- a/zscript/items/swwm_funstuff.zsc +++ b/zscript/items/swwm_funstuff.zsc @@ -641,7 +641,7 @@ Class PartyTime : SWWMNonInteractiveActor if ( ignite ) { // wait for the sound to stop - if ( !IsActorPlayingSound(CHAN_ITEM) ) + if ( !IsActorPlayingSound(CHAN_ITEM,-1) ) Destroy(); return; } diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index 12d84c0e8..fe3bd6ebd 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -2656,7 +2656,7 @@ Class MykradvoBurst : SWWMNonInteractiveActor { Spawn: XEX4 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\ 2 Bright; - TNT1 A 1 A_JumpIf(!IsActorPlayingSound(CHAN_VOICE)&&!(targets.Size()),1); + TNT1 A 1 A_JumpIf(!IsActorPlayingSound(CHAN_VOICE,-1)&&!(targets.Size()),1); Wait; TNT1 A 1; Stop; diff --git a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc index fe9f406b2..cb58507bd 100644 --- a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc @@ -1101,7 +1101,7 @@ Class YnykronShot : SWWMNonInteractiveActor SWWMUtility.AchievementProgress("ezkill",enemykills,target.player); enemykills = 0; } - if ( IsActorPlayingSound(CHAN_VOICE) ) + if ( IsActorPlayingSound(CHAN_VOICE,-1) ) return; // we're done here Destroy(); @@ -2410,7 +2410,7 @@ Class YnykronSingularity : SWWMNonInteractiveActor special1++; if ( special1 > 60 ) { - if ( IsActorPlayingSound(CHAN_VOICE) ) return; + if ( IsActorPlayingSound(CHAN_VOICE,-1) ) return; for ( int i=0; i