zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- looks like I missed one commit...

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-22 00:17:59 +01:00
parent c1ad44bcc9
commit ff3dec2f08
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -294,9 +294,9 @@ void CalcASSPan(int nPan, int nVolume, int *pLeft, int *pRight)
void ASSCallback(uint32_t num) void ASSCallback(uint32_t num)
{ {
// TODO: add mutex? // TODO: add mutex?
if (num == -1) if ((int32_t)num == -1)
handle = -1; handle = -1;
else if (num >= 0 && num < kMaxActiveSounds) else if ((int32_t)num >= 0 && (int32_t)num < kMaxActiveSounds)
sActiveSound[num].f_e = -1; sActiveSound[num].f_e = -1;
} }
@ -1004,7 +1004,7 @@ short PlayFX2(unsigned short nSound, short nSprite)
if (!dig) if (!dig)
return -1; return -1;
if (nSound < 0 || nSound >= kMaxSounds || !SoundBuf[nSound]) if ((nSound&0x1ff) >= kMaxSounds || !SoundBuf[(nSound&0x1ff)])
{ {
initprintf("PlayFX2: Invalid sound nSound == %i, nSprite == %i\n", nSound, nSprite); initprintf("PlayFX2: Invalid sound nSound == %i, nSprite == %i\n", nSound, nSprite);
return -1; return -1;
@ -1043,7 +1043,7 @@ short PlayFX2(unsigned short nSound, short nSprite)
int nDist = GetDistFromDXDY(dx, dy); int nDist = GetDistFromDXDY(dx, dy);
if (nDist >= 255) if (nDist >= 255)
{ {
if (nSound > -1) if ((int16_t)nSound > -1)
StopSpriteSound(nSound); StopSpriteSound(nSound);
return -1; return -1;
} }
@ -1055,7 +1055,7 @@ short PlayFX2(unsigned short nSound, short nSprite)
nVolume = gFXVolume+10-(Sin(nDist<<1)>>6)-10; nVolume = gFXVolume+10-(Sin(nDist<<1)>>6)-10;
if (nVolume <= 0) if (nVolume <= 0)
{ {
if (nSound > -1) if ((int16_t)nSound > -1)
StopSpriteSound(nSound); StopSpriteSound(nSound);
return -1; return -1;
} }