mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-21 20:11:12 +00:00
Merge branch 'soundflags' into 'next'
Use sound flags for sfxinfo, fix SF_TOTALLYSINGLE checks See merge request STJr/SRB2!1765
This commit is contained in:
commit
aaae90a5e3
2 changed files with 737 additions and 736 deletions
|
@ -222,7 +222,7 @@ static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo)
|
|||
}
|
||||
else if (origin && channels[cnum].origin == origin
|
||||
&& 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);
|
||||
break;
|
||||
|
|
1471
src/sounds.c
1471
src/sounds.c
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue