edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up few things

Browse source
This commit is contained in:
oy 2014-12-21 18:57:30 +01:00
parent d1ee52c372
commit 75222892be
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/engine/client/sound.cpp
View file

@ -59,7 +59,7 @@ static LOCK m_SoundLock = 0;
static int m_CenterX = 0; static int m_CenterX = 0;
static int m_CenterY = 0; static int m_CenterY = 0;
static int m_MaxDistance = 1500; static float m_MaxDistance = 1500.0f;
static int m_MixingRate = 48000; static int m_MixingRate = 48000;
static volatile int m_SoundVolume = 100; static volatile int m_SoundVolume = 100;
@ -78,13 +78,6 @@ static short Int2Short(int i)
return i; return i;
} }
static int IntAbs(int i)
{
if(i<0)
return -i;
return i;
}
static void Mix(short *pFinalOut, unsigned Frames) static void Mix(short *pFinalOut, unsigned Frames)
{ {
int MasterVol; int MasterVol;
@ -142,8 +135,8 @@ static void Mix(short *pFinalOut, unsigned Frames)
// linear falloff // linear falloff
float Falloff = 1.0f - Dist/m_MaxDistance; float Falloff = 1.0f - Dist/m_MaxDistance;
Lvol = (int)Lvol*Lgain*Falloff; Lvol = Lvol*Lgain*Falloff;
Rvol = (int)Rvol*Rgain*Falloff; Rvol = Rvol*Rgain*Falloff;
} }
else else
{ {