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, 5 insertions, 7 deletions

diff --git a/src/resources/image.h b/src/resources/image.h
index 34515dda..485ca227 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -62,18 +62,16 @@ class Image : public Resource
          *
          * @param buffer     The memory buffer containing the image data.
          * @param bufferSize The size of the memory buffer in bytes.
-         * @param idPath     The path identifying the resource.
          *
          * @return <code>NULL</code> if the an error occurred, a valid pointer
          *         otherwise.
          */
-        static Image*
-        load(void* buffer, unsigned int bufferSize, const std::string &idPath);
+        static Resource *load(void *buffer, unsigned bufferSize);
 
         /**
          * Loads an image from an SDL surface.
          */
-        static Image *load(SDL_Surface *, std::string const &idPath);
+        static Image *load(SDL_Surface *);
 
         /**
          * Frees the resources created by SDL.
@@ -129,8 +127,8 @@ class Image : public Resource
          * Constructor.
          */
 #ifdef USE_OPENGL
-        Image(const std::string &idPath, GLuint glimage, int width, int height,
-                int texWidth, int texHeight);
+        Image(GLuint glimage, int width, int height,
+              int texWidth, int texHeight);
 
         /**
          * Returns the first power of two equal or bigger than the input.
@@ -138,7 +136,7 @@ class Image : public Resource
         static int
         powerOfTwo(int input);
 #endif
-        Image(const std::string &idPath, SDL_Surface *image);
+        Image(SDL_Surface *image);
 
         SDL_Rect mBounds;
         bool mLoaded;