zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sound code fixes

Browse source
This commit is contained in:
nukeykt 2019-09-21 20:02:45 +09:00 committed by Christoph Oelckers
parent 213437deea
commit fe7cbf87b7
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/exhumed/src/sound.cpp
View file

@ -269,8 +269,17 @@ void CalcASSPan(int nPan, int nVolume, int *pLeft, int *pRight)
else if (nVolume > 127) else if (nVolume > 127)
nVolume = 127; nVolume = 127;
*pLeft = mulscale6(nPanTable[127-nPan], nVolume); *pLeft = mulscale6(nPanTable[nPan], nVolume);
*pRight = mulscale6(nPanTable[nPan], nVolume); *pRight = mulscale6(nPanTable[127-nPan], nVolume);
}
void ASSCallback(uint32_t num)
{
// TODO: add mutex?
if (num == -1)
handle = -1;
else if (num >= 0 && num < kMaxActiveSounds)
sActiveSound[num].f_e = -1;
} }
void CreateDistTable(void) void CreateDistTable(void)
@ -329,6 +338,8 @@ void InitFX(void)
dig = 1; dig = 1;
FX_SetCallBack(ASSCallback);
CreateDistTable(); CreateDistTable();
InitSoundInfo(); InitSoundInfo();
@ -794,7 +805,7 @@ void UpdateSounds()
if (nVolume != pASound->f_4 || nSoundAng != pASound->f_6) if (nVolume != pASound->f_4 || nSoundAng != pASound->f_6)
{ {
int nLeft, nRight; int nLeft, nRight;
int nPan = 63+(Sin(nSoundAng&1023)>>8); int nPan = 63+(Sin(nSoundAng+1023)>>8);
CalcASSPan(nPan, nVolume, &nLeft, &nRight); CalcASSPan(nPan, nVolume, &nLeft, &nRight);
FX_SetPan(pASound->f_e, nVolume, nLeft, nRight); FX_SetPan(pASound->f_e, nVolume, nLeft, nRight);
@ -1108,7 +1119,7 @@ short PlayFX2(unsigned short nSound, short nSprite)
vdi->f_1a = (int)totalclock; vdi->f_1a = (int)totalclock;
vdi->f_c = v20; vdi->f_c = v20;
vdi->f_a = vc; vdi->f_a = vc;
short nPan = 63+(Sin(nSoundAng&1023)>>8); short nPan = 63+(Sin(nSoundAng+1023)>>8);
int nLeft, nRight; int nLeft, nRight;
int bLoop = SoundBuf[nSound][26] == 6; int bLoop = SoundBuf[nSound][26] == 6;