summaryrefslogtreecommitdiff
path: root/src/sound.cpp
diff options
context:
space:
mode:
authorStefan Dombrowski <stefan@uni-bonn.de>2010-09-13 14:19:11 +0200
committerStefan Dombrowski <stefan@uni-bonn.de>2010-09-13 14:19:11 +0200
commitaf176c1f344a78a352ecaa6f252054f5ac38ec73 (patch)
treec4f42886095ca9e2d114e9b403977e6db3cc2cd1 /src/sound.cpp
parente93253b36b73d7335d98a3c73d532a1bbd7212a5 (diff)
downloadmana-af176c1f344a78a352ecaa6f252054f5ac38ec73.tar.gz
mana-af176c1f344a78a352ecaa6f252054f5ac38ec73.tar.bz2
mana-af176c1f344a78a352ecaa6f252054f5ac38ec73.tar.xz
mana-af176c1f344a78a352ecaa6f252054f5ac38ec73.zip
Avoid loading non-existing music and minimaps
Reviewed-by: Thorbjorn
Diffstat (limited to 'src/sound.cpp')
-rw-r--r--src/sound.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/sound.cpp b/src/sound.cpp
index d3542a48..fa39e49b 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -195,12 +195,7 @@ void Sound::stopMusic()
logger->log("Sound::stopMusic()");
- if (mMusic)
- {
- Mix_HaltMusic();
- Mix_FreeMusic(mMusic);
- mMusic = NULL;
- }
+ haltMusic();
}
void Sound::fadeInMusic(const std::string &path, int ms)