zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-21 11:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- the sound compatibility flags do not need level support.

Browse source 
They are intentionally omitted from both MAPINFO and compatibility settings.
This removes the last place where it still went through the map-modified versions of the compatflags.

# Conflicts:
#	src/s_sound.cpp
This commit is contained in:
Christoph Oelckers 2019-01-11 12:10:59 +01:00
parent af06d7cb9e
commit f7489976ec
1 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/s_sound.cpp
View file

@ -973,15 +973,15 @@ static FSoundChan *S_StartSound(AActor *actor, const sector_t *sec, const FPolyO
return nullptr;
}
if (i_compatflags & COMPATF_MAGICSILENCE)
if (compatflags & COMPATF_MAGICSILENCE)
{ // For people who just can't play without a silent BFG.
channel = CHAN_WEAPON;
}
else if ((chanflags & CHAN_MAYBE_LOCAL) && (i_compatflags & COMPATF_SILENTPICKUP))
else if ((chanflags & CHAN_MAYBE_LOCAL) && (compatflags & COMPATF_SILENTPICKUP))
{
if (actor != NULL && actor != players[consoleplayer].camera)
if (actor != nullptr && actor != players[consoleplayer].camera)
{
return NULL;
return nullptr;
}
}