summaryrefslogtreecommitdiff
path: root/src/sound.cpp
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-01-13 16:28:50 +0000
committerDavid Athay <ko2fan@gmail.com>2008-01-13 16:28:50 +0000
commit3bf3c05f1b999914875d5fb0797c4c9ca098ede0 (patch)
tree8bb49e7960cd27e0343c65ae43d646e52f566f71 /src/sound.cpp
parent2928c5444892538f0153b5dd6e39d9a4bff5585d (diff)
downloadmana-3bf3c05f1b999914875d5fb0797c4c9ca098ede0.tar.gz
mana-3bf3c05f1b999914875d5fb0797c4c9ca098ede0.tar.bz2
mana-3bf3c05f1b999914875d5fb0797c4c9ca098ede0.tar.xz
mana-3bf3c05f1b999914875d5fb0797c4c9ca098ede0.zip
Fixed non-default location music loading
Diffstat (limited to 'src/sound.cpp')
-rw-r--r--src/sound.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sound.cpp b/src/sound.cpp
index cf77cfab..9e265b52 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -126,13 +126,15 @@ void Sound::setSfxVolume(int volume)
Mix_Volume(-1, volume);
}
-void Sound::playMusic(const std::string &path, int loop)
+void Sound::playMusic(const std::string &filename, int loop)
{
if (!mInstalled) return;
if (mMusic != NULL) {
stopMusic();
}
+
+ std::string path = mResourceManager->getPath("music/" + filename);
logger->log("Sound::startMusic() Playing \"%s\" %i times", path.c_str(),
loop);