Permalink
Browse files

- fixed crash when playing sounds with no level loaded

  • Loading branch information...
alexey-lysiuk committed Jan 11, 2019
1 parent 4ee7827 commit e68b3f6694c281306dce94a7f95e2acb016538c6
Showing with 10 additions and 7 deletions.
  1. +10 −7 src/s_sound.cpp
@@ -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;
}
}
}

0 comments on commit e68b3f6

Please sign in to comment.