zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- removed unneeded check for 'listenactor' in S_UpdateSounds.

This commit is contained in:
Christoph Oelckers 2016-01-27 09:56:40 +01:00
parent d2beec4585
commit f2666f70dd
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/s_sound.cpp
View File

@ -1917,32 +1917,29 @@ void S_UpdateSounds (AActor *listenactor)
S_ActivatePlayList(false); S_ActivatePlayList(false);
} }
if (listenactor != NULL) // should never happen
S_SetListener(listener, listenactor);
for (FSoundChan *chan = Channels; chan != NULL; chan = chan->NextChan)
{ {
// should never happen if ((chan->ChanFlags & (CHAN_EVICTED | CHAN_IS3D)) == CHAN_IS3D)
S_SetListener(listener, listenactor);
for (FSoundChan *chan = Channels; chan != NULL; chan = chan->NextChan)
{ {
if ((chan->ChanFlags & (CHAN_EVICTED | CHAN_IS3D)) == CHAN_IS3D) CalcPosVel(chan, &pos, &vel);
{ GSnd->UpdateSoundParams3D(&listener, chan, !!(chan->ChanFlags & CHAN_AREA), pos, vel);
CalcPosVel(chan, &pos, &vel);
GSnd->UpdateSoundParams3D(&listener, chan, !!(chan->ChanFlags & CHAN_AREA), pos, vel);
}
chan->ChanFlags &= ~CHAN_JUSTSTARTED;
} }
chan->ChanFlags &= ~CHAN_JUSTSTARTED;
}
SN_UpdateActiveSequences(); SN_UpdateActiveSequences();
GSnd->UpdateListener(&listener); GSnd->UpdateListener(&listener);
GSnd->UpdateSounds(); GSnd->UpdateSounds();
if (level.time >= RestartEvictionsAt) if (level.time >= RestartEvictionsAt)
{ {
RestartEvictionsAt = 0; RestartEvictionsAt = 0;
S_RestoreEvictedChannels(); S_RestoreEvictedChannels();
}
} }
} }