OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Revert IsActorPlayingSound hotfix, not needed in this branch.

Browse source
This commit is contained in:
Mari the Deer 2023-01-14 19:19:08 +01:00
commit a342651842
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/handler/swwm_handler_oneliners.zsc
View file

@ -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")