diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-03-23 01:27:13 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-03-23 01:27:13 +0000 |
commit | 9dd811b55587aeb76344b835006cb4a01601bb5d (patch) | |
tree | bd297391e264a09ce8467bcf780927a4cef09991 /src/sound.cpp | |
parent | bd8a35eca8c2fa6eb33e7d9219e3fa4d287a2059 (diff) | |
download | mana-client-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.gz mana-client-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.bz2 mana-client-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.xz mana-client-9dd811b55587aeb76344b835006cb4a01601bb5d.zip |
Merged revisions 3823,3825-3826,3829,3831-3839,3841-3842 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r3823 | crush_tmw | 2007-12-28 19:36:58 +0100 (Fri, 28 Dec 2007) | 1 line
Added the possibility to assign particle effects to monsters in the monster database. Added flame particle effect to fire goblin as a proof of concept.
........
r3826 | crush_tmw | 2007-12-30 01:02:14 +0100 (Sun, 30 Dec 2007) | 1 line
Added a key for targeting the nearest player character based on patches by Trinexx. Some mapping fixes at snake dungeon map.
........
r3839 | the_enemy | 2008-01-13 17:28:50 +0100 (Sun, 13 Jan 2008) | 1 line
Fixed non-default location music loading
........
r3842 | crush_tmw | 2008-01-14 11:48:13 +0100 (Mon, 14 Jan 2008) | 1 line
ixed an error in Davids last commit (couldn't compile that way).
........
Diffstat (limited to 'src/sound.cpp')
-rw-r--r-- | src/sound.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sound.cpp b/src/sound.cpp index cf77cfab..063195ae 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -126,7 +126,7 @@ 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; @@ -134,6 +134,9 @@ void Sound::playMusic(const std::string &path, int loop) stopMusic(); } + ResourceManager *resman = ResourceManager::getInstance(); + std::string path = resman->getPath("music/" + filename); + logger->log("Sound::startMusic() Playing \"%s\" %i times", path.c_str(), loop); |