lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'sound-origin' into 'next'

Browse source 
Apply volume to sounds with origin too

See merge request STJr/SRB2!1156
This commit is contained in:
Lachlan Wright 2020-09-25 10:04:46 -04:00
parent 92b61aacd8 de9d1d2b35
commit b4f9767b7b
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/s_sound.c
View file

@ -521,6 +521,7 @@ void S_StartCaption(sfxenum_t sfx_id, INT32 cnum, UINT16 lifespan)
void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume) void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
{ {
const INT32 initial_volume = volume;
INT32 sep, pitch, priority, cnum; INT32 sep, pitch, priority, cnum;
const sfxenum_t actual_id = sfx_id; const sfxenum_t actual_id = sfx_id;
sfxinfo_t *sfx; sfxinfo_t *sfx;
@ -718,6 +719,7 @@ dontplay:
// Assigns the handle to one of the channels in the // Assigns the handle to one of the channels in the
// mix/output buffer. // mix/output buffer.
channels[cnum].volume = initial_volume;
channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum); channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
} }
@ -929,7 +931,7 @@ void S_UpdateSounds(void)
if (I_SoundIsPlaying(c->handle)) if (I_SoundIsPlaying(c->handle))
{ {
// initialize parameters // initialize parameters
volume = 255; // 8 bits internal volume precision volume = c->volume; // 8 bits internal volume precision
pitch = NORM_PITCH; pitch = NORM_PITCH;
sep = NORM_SEP; sep = NORM_SEP;
@ -1204,15 +1206,12 @@ INT32 S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *v
} }
// volume calculation // volume calculation
if (approx_dist < S_CLOSE_DIST) /* not sure if it should be > (no =), but this matches the old behavior */
{ if (approx_dist >= S_CLOSE_DIST)
// SfxVolume is now hardware volume
*vol = 255; // not snd_SfxVolume
}
else
{ {
// distance effect // distance effect
*vol = (15 * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS)) / S_ATTENUATOR; INT32 n = (15 * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS));
*vol = FixedMul(*vol * FRACUNIT / 255, n) / S_ATTENUATOR;
} }
return (*vol > 0); return (*vol > 0);

3
src/s_sound.h
View file

@ -87,6 +87,9 @@ typedef struct
// origin of sound // origin of sound
const void *origin; const void *origin;
// initial volume of sound, which is applied after distance and direction
INT32 volume;
// handle of the sound being played // handle of the sound being played
INT32 handle; INT32 handle;