Merged revisions 3642,3662-3664,3667 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk

........
  r3642 | gmelquio | 2007-10-19 19:46:46 +0200 (Fri, 19 Oct 2007) | 1 line
  
  Factored code between resource handlers. Implemented failure-friendly sprite loader.
........
  r3662 | gmelquio | 2007-10-21 21:01:16 +0200 (Sun, 21 Oct 2007) | 1 line
  
  Added persistent positioning.
........
  r3663 | gmelquio | 2007-10-21 21:03:43 +0200 (Sun, 21 Oct 2007) | 1 line
  
  Fixed missing pixels at bottom and right.
........
  r3664 | gmelquio | 2007-10-21 21:05:56 +0200 (Sun, 21 Oct 2007) | 1 line
  
  Changed to use default values when restoring missing settings.
........
  r3667 | gmelquio | 2007-10-21 22:09:08 +0200 (Sun, 21 Oct 2007) | 1 line
  
  Fixed invisible text in dropboxes and shopboxes.
........

1 files changed, 3 insertions, 11 deletions

diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index bb35218e..ec9bc65c 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -25,20 +25,12 @@
 
 #include "../log.h"
 
-SoundEffect::SoundEffect(const std::string &idPath, Mix_Chunk *soundEffect):
-    Resource(idPath),
-    mChunk(soundEffect)
-{
-}
-
 SoundEffect::~SoundEffect()
 {
     Mix_FreeChunk(mChunk);
 }
 
-SoundEffect*
-SoundEffect::load(void *buffer, unsigned int bufferSize,
-                  const std::string &idPath)
+Resource *SoundEffect::load(void *buffer, unsigned bufferSize)
 {
     // Load the raw file data from the buffer in an RWops structure
     SDL_RWops *rw = SDL_RWFromMem(buffer, bufferSize);
@@ -48,11 +40,11 @@ SoundEffect::load(void *buffer, unsigned int bufferSize,
 
     if (tmpSoundEffect)
     {
-        return new SoundEffect(idPath, tmpSoundEffect);
+        return new SoundEffect(tmpSoundEffect);
     }
     else
     {
-        logger->log("Error while loading sound effect (%s)", idPath.c_str());
+        logger->log("Error, failed to load sound effect: %s", Mix_GetError());
         return NULL;
     }
 }