diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-21 22:54:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-21 22:54:50 +0300 |
| commit | f6ae77d4d5728dbee51d107653d4775587e46f54 (patch) | |
| tree | dea7d10239064d82e73cd7df6b616e52bc44685e /src/soundmanager.cpp | |
| parent | b5c71a87d2a0c2c6981331d5958b474162934532 (diff) | |
| download | manaplus-f6ae77d4d5728dbee51d107653d4775587e46f54.tar.gz manaplus-f6ae77d4d5728dbee51d107653d4775587e46f54.tar.bz2 manaplus-f6ae77d4d5728dbee51d107653d4775587e46f54.tar.xz manaplus-f6ae77d4d5728dbee51d107653d4775587e46f54.zip | |
Remove extra "sfx/" in sound files path and assert about this.
Diffstat (limited to 'src/soundmanager.cpp')
| -rw-r--r-- | src/soundmanager.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
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) { |