Merge branch '1.0'

Conflicts:
	src/actorspritemanager.h
	src/beingmanager.cpp
	src/game.cpp
	src/gui/beingpopup.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/inventorywindow.h
	src/gui/itempopup.cpp
	src/gui/socialwindow.cpp
	src/gui/statuswindow.cpp
	src/gui/widgets/chattab.cpp
	src/gui/widgets/chattab.h
	src/net/tmwa/inventoryhandler.cpp
	src/net/tmwa/partyhandler.cpp
	src/party.cpp
	src/sound.cpp
	src/utils/stringutils.cpp
	src/utils/stringutils.h

1 files changed, 2 insertions, 8 deletions

diff --git a/src/sound.cpp b/src/sound.cpp
index a859cb6e..6fe9668d 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)
@@ -239,8 +234,7 @@ void Sound::playSfx(const std::string &path)
         return;
 
     ResourceManager *resman = ResourceManager::getInstance();
-    SoundEffect *sample = resman->getSoundEffect(
-                                            paths.getStringValue("sfx") + path);
+    SoundEffect *sample = resman->getSoundEffect(path);
     if (sample)
     {
         logger->log("Sound::playSfx() Playing: %s", path.c_str());