Don't try to play empty strings as sounds, and don't return a SoundEffect

instance when Mix_Chunk loading failed.

5 files changed, 23 insertions, 14 deletions

diff --git a/src/monster.cpp b/src/monster.cpp
index f624ff07..68e9d6ba 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -73,11 +73,11 @@ Monster::setAction(Uint8 action)
             break;
         case DEAD:
             currentAction = ACTION_DEAD;
-            sound.playSfx(MonsterDB::get(mJob-1002).getSound(EVENT_DIE).c_str());
+            sound.playSfx(MonsterDB::get(mJob - 1002).getSound(EVENT_DIE));
             break;
         case ATTACK:
             currentAction = ACTION_ATTACK;
-            sound.playSfx(MonsterDB::get(mJob-1002).getSound(EVENT_HIT).c_str());
+            sound.playSfx(MonsterDB::get(mJob - 1002).getSound(EVENT_HIT));
             mSprites[BASE_SPRITE]->reset();
             break;
         case STAND:
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 9ad18db3..4ed316cf 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -174,9 +174,9 @@ ResourceManager::get(const E_RESOURCE_TYPE &type, const std::string &idPath)
 
     free(buffer);
 
-    if (resource) {
+    if (resource)
+    {
         resource->incRef();
-
         mResources[idPath] = resource;
     }
 
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index 3340e5ea..bb35218e 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -23,6 +23,8 @@
 
 #include "soundeffect.h"
 
+#include "../log.h"
+
 SoundEffect::SoundEffect(const std::string &idPath, Mix_Chunk *soundEffect):
     Resource(idPath),
     mChunk(soundEffect)
@@ -41,13 +43,18 @@ SoundEffect::load(void *buffer, unsigned int bufferSize,
     // Load the raw file data from the buffer in an RWops structure
     SDL_RWops *rw = SDL_RWFromMem(buffer, bufferSize);
 
-    // Use Mix_LoadWAV_RW to load the raw music data
-    Mix_Chunk *tmpSoundEffect = Mix_LoadWAV_RW(rw, 0);
-
-    // Now free the SDL_RWops data
-    SDL_FreeRW(rw);
+    // Load the music data and free the RWops structure
+    Mix_Chunk *tmpSoundEffect = Mix_LoadWAV_RW(rw, 1);
 
-    return new SoundEffect(idPath, tmpSoundEffect);
+    if (tmpSoundEffect)
+    {
+        return new SoundEffect(idPath, tmpSoundEffect);
+    }
+    else
+    {
+        logger->log("Error while loading sound effect (%s)", idPath.c_str());
+        return NULL;
+    }
 }
 
 bool
diff --git a/src/sound.cpp b/src/sound.cpp
index 8b012176..1ef4c23d 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -191,15 +191,15 @@ void Sound::fadeOutMusic(int ms)
     }
 }
 
-void Sound::playSfx(const char *path)
+void Sound::playSfx(const std::string &path)
 {
-    if (!mInstalled) return;
+    if (!mInstalled || path.length() == 0) return;
 
     ResourceManager *resman = ResourceManager::getInstance();
     SoundEffect *sample = resman->getSoundEffect(path);
     if (sample) {
+        logger->log("Sound::playSfx() Playing: %s", path.c_str());
         sample->play(0, 120);
-        logger->log("Sound::playSfx() Playing: %s", path);
     }
 }
 
diff --git a/src/sound.h b/src/sound.h
index 39901121..07db0587 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -26,6 +26,8 @@
 
 #include <SDL_mixer.h>
 
+#include <string>
+
 /** Sound engine
  *
  * \ingroup CORE
@@ -105,7 +107,7 @@ class Sound {
          *
          * \param path     Full path to file
          */
-        void playSfx(const char *path);
+        void playSfx(const std::string &path);
 
     private:
         bool mInstalled;