diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-01-14 10:48:13 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2008-01-14 10:48:13 +0000 |
| commit | 4049c6a791ce349d652c2c770c70d9f1a5909f28 (patch) | |
| tree | a41f7dafca2b54f9b4f1ff71f291a743f7d29145 | |
| parent | 524d2d23d632907d9158de93a7237c853ceef241 (diff) | |
| download | mana-client-4049c6a791ce349d652c2c770c70d9f1a5909f28.tar.gz mana-client-4049c6a791ce349d652c2c770c70d9f1a5909f28.tar.bz2 mana-client-4049c6a791ce349d652c2c770c70d9f1a5909f28.tar.xz mana-client-4049c6a791ce349d652c2c770c70d9f1a5909f28.zip | |
ixed an error in Davids last commit (couldn't compile that way).
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/sound.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -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); |