summaryrefslogtreecommitdiff
path: root/src/engine.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-14 23:47:22 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-14 23:53:26 +0200
commitbeac98b7d093bca0fa921e5e30c2b766fb0298e9 (patch)
tree74adb5d59e6bd074a8483d14966ab2913fd50cc1 /src/engine.cpp
parent2f04d1c1aa1fca06754eb5c8bad631d4fbfab6df (diff)
downloadmana-client-beac98b7d093bca0fa921e5e30c2b766fb0298e9.tar.gz
mana-client-beac98b7d093bca0fa921e5e30c2b766fb0298e9.tar.bz2
mana-client-beac98b7d093bca0fa921e5e30c2b766fb0298e9.tar.xz
mana-client-beac98b7d093bca0fa921e5e30c2b766fb0298e9.zip
Cleanup of Sound class, fixing restoring of volumes and music
While a previous commit fixed the restoring of music of the current map in the setup window, this commit makes sure that the Sound class itself will resume a previously playing song when it is re-initialized. Other fixes: * Restore the correct volumes when enabling sound * Play the right audio track during login * Specify which font to use for bold text
Diffstat (limited to 'src/engine.cpp')
-rw-r--r--src/engine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index 555c3f17..95f2cb1b 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -132,7 +132,7 @@ bool Engine::changeMap(const std::string &mapPath)
std::string newMusic = newMap->getProperty("music");
if (newMusic != oldMusic)
- sound.playMusic(newMusic, -1);
+ sound.playMusic(newMusic);
mCurrentMap = newMap;