zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-02 00:43:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed crash when playing sounds with no level loaded

Browse source
This commit is contained in:
alexey.lysiuk 2019-01-11 12:55:51 +02:00
parent 4ee7827d2c
commit e68b3f6694
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/s_sound.cpp
View file

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