summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-21 22:54:50 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-21 22:54:50 +0300
commitf6ae77d4d5728dbee51d107653d4775587e46f54 (patch)
treedea7d10239064d82e73cd7df6b616e52bc44685e /src
parentb5c71a87d2a0c2c6981331d5958b474162934532 (diff)
downloadplus-f6ae77d4d5728dbee51d107653d4775587e46f54.tar.gz
plus-f6ae77d4d5728dbee51d107653d4775587e46f54.tar.bz2
plus-f6ae77d4d5728dbee51d107653d4775587e46f54.tar.xz
plus-f6ae77d4d5728dbee51d107653d4775587e46f54.zip
Remove extra "sfx/" in sound files path and assert about this.
Diffstat (limited to 'src')
-rw-r--r--src/resources/beinginfo.cpp2
-rw-r--r--src/resources/iteminfo.cpp2
-rw-r--r--src/soundmanager.cpp11
3 files changed, 3 insertions, 12 deletions
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)
{