fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-13 07:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sound looping bug fix from eric - https://sourceforge.net/p/quakespasm/patches/12/

Browse source 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@886 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
stevenaaus 2014-01-12 02:55:04 +00:00
parent 9c3f7071af
commit a1dc252423
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Quake/snd_mix.c
View file

@ -158,8 +158,8 @@ CHANNEL MIXING
===============================================================================
*/
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime);
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime);
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime, int paintbufferstart);
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime, int paintbufferstart);
void S_PaintChannels (int endtime)
{
@ -228,10 +228,12 @@ void S_PaintChannels (int endtime)
if (count > 0)
{
// the last param to SND_PaintChannelFrom is the index
// to start painting to in the paintbuffer, usually 0.
if (sc->width == 1)
SND_PaintChannelFrom8(ch, sc, count);
SND_PaintChannelFrom8(ch, sc, count, ltime - paintedtime);
else
SND_PaintChannelFrom16(ch, sc, count);
SND_PaintChannelFrom16(ch, sc, count, ltime - paintedtime);
ltime += count;
}
@ -282,7 +284,7 @@ void SND_InitScaletable (void)
}
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count, int paintbufferstart)
{
int data;
int *lscale, *rscale;
@ -301,14 +303,14 @@ static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
for (i = 0; i < count; i++)
{
data = sfx[i];
paintbuffer[i].left += lscale[data];
paintbuffer[i].right += rscale[data];
paintbuffer[paintbufferstart + i].left += lscale[data];
paintbuffer[paintbufferstart + i].right += rscale[data];
}
ch->pos += count;
}
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count, int paintbufferstart)
{
int data;
int left, right;
@ -331,8 +333,8 @@ static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
// right = (data * rightvol) >> 8;
left = data * leftvol;
right = data * rightvol;
paintbuffer[i].left += left;
paintbuffer[i].right += right;
paintbuffer[paintbufferstart + i].left += left;
paintbuffer[paintbufferstart + i].right += right;
}
ch->pos += count;