OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Patch IsActorPlayingSound calls until next GZDoom update.

Browse source
This commit is contained in:
Mari the Deer 2022-12-06 18:47:26 +01:00
commit 57327fa8f6
5 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)
&& 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")

2
zscript/items/swwm_funstuff.zsc
View file

@ -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;
}

2
zscript/items/swwm_powerups.zsc
View file

@ -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;

6
zscript/weapons/swwm_deathlydeathcannon_fx.zsc
View file

@ -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<MAXBEAMS; i++ ) if ( beamers[i] ) return;
Destroy();
return;
@ -2688,7 +2688,7 @@ Class YnykronAltShot : SWWMNonInteractiveActor
freezetics--;
return;
}
if ( isFrozen() || IsActorPlayingSound(CHAN_VOICE) ) return;
if ( isFrozen() || IsActorPlayingSound(CHAN_VOICE,-1) ) return;
Destroy();
}
}