summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/sound.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index baeb98c3..8d101961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* data/maps/new_10-1.tmx, data/maps/new_11-1.tmx: Added new versions of
snow maps by 5t3v3.
+ * src/sound.cpp: Fixed an error in Davids last commit (couldn't compile
+ that way).
2008-01-13 David Athay <ko2fan@gmail.com>
diff --git a/src/sound.cpp b/src/sound.cpp
index 9e265b52..063195ae 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -133,8 +133,9 @@ void Sound::playMusic(const std::string &filename, int loop)
if (mMusic != NULL) {
stopMusic();
}
-
- std::string path = mResourceManager->getPath("music/" + filename);
+
+ ResourceManager *resman = ResourceManager::getInstance();
+ std::string path = resman->getPath("music/" + filename);
logger->log("Sound::startMusic() Playing \"%s\" %i times", path.c_str(),
loop);