From f6ae77d4d5728dbee51d107653d4775587e46f54 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 21 Jun 2017 22:54:50 +0300
Subject: Remove extra "sfx/" in sound files path and assert about this.

---
 src/resources/beinginfo.cpp |  2 +-
 src/resources/iteminfo.cpp  |  2 +-
 src/soundmanager.cpp        | 11 +----------
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 5c10d5ae3..4093a95b8 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -149,7 +149,7 @@ void BeingInfo::addSound(const ItemSoundEvent::Type event,
         mSounds[event] = new SoundInfoVect;
 
     if (mSounds[event] != nullptr)
-        mSounds[event]->push_back(SoundInfo("sfx/" + filename, delay));
+        mSounds[event]->push_back(SoundInfo(filename, delay));
 }
 
 const SoundInfo &BeingInfo::getSound(const ItemSoundEvent::Type event) const
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 7218f2cc8..8a142ec4d 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -152,7 +152,7 @@ void ItemInfo::addSound(const ItemSoundEvent::Type event,
                         const std::string &filename, const int delay)
 {
     mSounds[event].push_back(SoundInfo(
-        pathJoin(paths.getStringValue("sfx"), filename),
+        filename,
         delay));
 }
 
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 4e8a90770..d28091ce5 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -456,16 +456,7 @@ void SoundManager::playSfx(const std::string &path,
     if (!mInstalled || path.empty() || !mPlayBattle)
         return;
 
-    std::string tmpPath;
-    if (path.compare(0, 4, "sfx/") == 0)
-    {
-        tmpPath = path;
-        reportAlways("Sfx sound with sfx/ in path. Please remove sfx/");
-    }
-    else
-    {
-        tmpPath = pathJoin(paths.getValue("sfx", "sfx"), path);
-    }
+    std::string tmpPath = pathJoin(paths.getStringValue("sfx"), path);
     SoundEffect *const sample = Loader::getSoundEffect(tmpPath);
     if (sample != nullptr)
     {
-- 
cgit v1.2.3-60-g2f50