Uncouple s_volume from raw samples (Ogg playback and cinematics)

This commit is contained in:
Daniel Gibson 2015-11-01 18:02:22 +01:00
parent fd31e0060d
commit 4e13e3ee69
2 changed files with 1 additions and 3 deletions

View file

@ -239,7 +239,7 @@ AL_PlayChannel(channel_t *ch)
}
/* Clamp volume */
vol = ch->oal_vol + s_volume->value;
vol = ch->oal_vol;
if (vol > 1.0f)
{
@ -602,7 +602,6 @@ AL_Update(void)
/* set listener (player) parameters */
AL_CopyVector(listener_forward, orientation);
AL_CopyVector(listener_up, orientation + 3);
qalListenerf(AL_GAIN, s_volume->value);
qalListenerf(AL_MAX_GAIN, s_openal_maxgain->value);
qalDistanceModel(AL_LINEAR_DISTANCE_CLAMPED);
qalListener3f(AL_POSITION, AL_UnpackVector(listener_origin));

View file

@ -830,7 +830,6 @@ S_RawSamples(int samples, int rate, int width,
#if USE_OPENAL
if (sound_started == SS_OAL)
{
volume = volume * (s_volume->value);
AL_RawSamples(samples, rate, width, channels, data, volume);
}
else