Merge branch 'master' into invfiler

1 files changed, 32 insertions, 0 deletions

diff --git a/src/sound.cpp b/src/sound.cpp
index 8742ce361..080426a39 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -22,6 +22,7 @@
 #include <SDL.h>
 
 #include "configuration.h"
+#include "localplayer.h"
 #include "log.h"
 #include "sound.h"
 
@@ -280,6 +281,37 @@ void Sound::playSfx(const std::string &path)
     }
 }
 
+void Sound::playSfx(const std::string &path, int x, int y)
+{
+    if (!mInstalled || path.empty() || !mPlayBattle)
+        return;
+
+    std::string tmpPath;
+    if (!path.find("sfx/"))
+        tmpPath = path;
+    else
+        tmpPath = paths.getValue("sfx", "sfx/") + path;
+    ResourceManager *resman = ResourceManager::getInstance();
+    SoundEffect *sample = resman->getSoundEffect(tmpPath);
+    if (sample)
+    {
+        logger->log("Sound::playSfx() Playing: %s", path.c_str());
+        int vol = 120;
+        if (player_node)
+        {
+            int dx = player_node->getTileX() - x;
+            int dy = player_node->getTileY() - y;
+            if (dx < 0)
+                dx = -dx;
+            if (dy < 0)
+                dy = -dy;
+            int dist = dx > dy ? dx : dy;
+            vol -= dist * 8;
+        }
+        sample->play(0, vol);
+    }
+}
+
 void Sound::playGuiSfx(const std::string &path)
 {
     if (!mInstalled || path.empty() || !mPlayGui)