incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow efx and non efx to be played at the same time on sounds with an origin

Browse source
This commit is contained in:
NepDisk 2026-03-22 15:51:21 -04:00
parent 057b46010f
commit 2c53e42b8a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/s_sound.c
View file

@ -191,7 +191,7 @@ static void S_StopChannel(INT32 cnum);
//
// If none available, return -1. Otherwise channel #.
//
static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo)
static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo, efx_t *efx)
{
// channel number to use
INT32 cnum;
@ -213,7 +213,7 @@ static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo)
S_StopChannel(cnum);
break;
}
else if (origin && channels[cnum].origin == origin && channels[cnum].sfxinfo == sfxinfo)
else if (origin && channels[cnum].origin == origin && channels[cnum].sfxinfo == sfxinfo && efx == channels[cnum].efx)
{
if (sfxinfo->flags & SF_NOINTERRUPT)
return -1;
@ -720,7 +720,7 @@ void S_StartSoundAtVolumeEx(const void *origin_p, sfxenum_t sfx_id, INT32 volume
}
// At this point it is determined that a sound can and should be played, so find a free channel to play it on
cnum = S_getChannel(origin, sfx);
cnum = S_getChannel(origin, sfx, efx);
if (cnum < 0)
{