Added .gitignore to ignore certain files + fixed access rights on Makefile* as

[quix0rs-blobwars.git] / src / CAudio.cpp

diff --git a/src/CAudio.cpp b/src/CAudio.cpp
index f37aa30b7d16fa4faf19930c84cc226f6111d6b1..c713aaa396d25d921cec4be4210e5842c43ba254 100644 (file)
--- a/src/CAudio.cpp
+++ b/src/CAudio.cpp
@@ -1,5 +1,6 @@
 /*
-Copyright (C) 2004-2010 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
+Copyright (C) 2011-2015 Perpendicular Dimensions
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -177,7 +178,7 @@ bool Audio::loadMusic(const char *filename)
        return true;
 }
 
-void Audio::playSound(int snd, int channel)
+void Audio::playSoundRelative(int snd, int channel, float x)
 {
        if ((!engine->useAudio) || (soundVolume == 0))
                return;
@@ -187,9 +188,29 @@ void Audio::playSound(int snd, int channel)
                return;
        }
 
-       Mix_Volume(channel, soundVolume);
+       int angle = atanf(x / 480) * 180 / M_PI;
+       int attenuation = fabsf(x) / 40;
+
+       if (angle < 0)
+               angle += 360;
 
+       if (attenuation > 255)
+               attenuation = 255;
+
+       Mix_Volume(channel, soundVolume);
        Mix_PlayChannel(channel, sound[snd], 0);
+       Mix_SetPosition(channel, angle, attenuation);
+}
+
+void Audio::playSound(int snd, int channel, float x)
+{
+       x -= (engine->playerPosX + 320);
+       playSoundRelative(snd, channel, x);
+}
+
+void Audio::playSound(int snd, int channel)
+{
+       playSoundRelative(snd, channel, 0);
 }
 
 void Audio::playMusic()