stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'soundflags' into 'next'

Browse source 
Use sound flags for sfxinfo, fix SF_TOTALLYSINGLE checks

See merge request STJr/SRB2!1765
This commit is contained in:
sphere 2022-09-16 22:31:51 +00:00
commit aaae90a5e3
2 changed files with 737 additions and 736 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/s_sound.c
View file

@ -222,7 +222,7 @@ static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo)
} }
else if (origin && channels[cnum].origin == origin else if (origin && channels[cnum].origin == origin
&& channels[cnum].sfxinfo->name != sfxinfo->name && channels[cnum].sfxinfo->name != sfxinfo->name
&& channels[cnum].sfxinfo->pitch == SF_TOTALLYSINGLE && sfxinfo->pitch == SF_TOTALLYSINGLE) && channels[cnum].sfxinfo->pitch & SF_TOTALLYSINGLE && sfxinfo->pitch & SF_TOTALLYSINGLE)
{ {
S_StopChannel(cnum); S_StopChannel(cnum);
break; break;

1471
src/sounds.c
View file

File diff suppressed because it is too large Load diff