1 files changed, 80 insertions, 32 deletions

diff --git a/src/resources/image.h b/src/resources/image.h
index f497f608..9c0f9da7 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -88,19 +88,15 @@ class Image : public Resource
         static Image *load(SDL_Surface *);
 
         /**
-         * Gets an scaled instance of an image.
-         *
-         * @param width The desired width of the scaled image.
-         * @param height The desired height of the scaled image.
-         *
-         * @return A new Image* object.
+         * Frees the resources created by SDL.
          */
-        Image* SDLgetScaledImage(int width, int height);
+        virtual void unload();
 
         /**
-         * Frees the resources created by SDL.
+         * Tells is the image is loaded
          */
-        virtual void unload();
+        bool isLoaded()
+        { return mLoaded; }
 
         /**
          * Returns the width of the image.
@@ -115,12 +111,29 @@ class Image : public Resource
         { return mBounds.h; }
 
         /**
-         * Tells if the image was loade using OpenGL or SDL
+         * Tells if the image was loaded using OpenGL or SDL
          * @return true if OpenGL, false if SDL.
          */
         bool isAnOpenGLOne() const;
 
         /**
+         * Tells if the image has got an alpha channel
+         * @return true if it's true, false otherwise.
+         */
+        bool hasAlphaChannel();
+
+        /**
+         * Sets the alpha value of this image.
+         */
+        virtual void setAlpha(float alpha);
+
+        /**
+         * Returns the alpha value of this image.
+         */
+        float getAlpha() const
+        { return mAlpha; }
+
+        /**
          * Creates a new image with the desired clipping rectangle.
          *
          * @return <code>NULL</code> if creation failed and a valid
@@ -128,17 +141,38 @@ class Image : public Resource
          */
         virtual Image *getSubImage(int x, int y, int width, int height);
 
+
+        // SDL only public functions
+
         /**
-         * Sets the alpha value of this image.
+         * Gets an scaled instance of an image.
+         *
+         * @param width The desired width of the scaled image.
+         * @param height The desired height of the scaled image.
+         *
+         * @return A new Image* object.
          */
-        virtual void setAlpha(float alpha);
+        Image* SDLgetScaledImage(int width, int height);
 
         /**
-         * Returns the alpha value of this image.
+         * Merges two image SDL_Surfaces together. This is for SDL use only, as
+         * reducing the number of surfaces that SDL has to render can cut down
+         * on the number of blit operations necessary, which in turn can help
+         * improve overall framerates. Don't use unless you are using it to
+         * reduce the number of overall layers that need to be drawn through SDL.
          */
-        float getAlpha() const;
+        Image *SDLmerge(Image *image, int x, int y);
+
+        /**
+         * Get the alpha Channel of a SDL surface.
+         */
+        Uint8 *SDLgetAlphaChannel() const
+        { return mAlphaChannel; }
 
 #ifdef USE_OPENGL
+
+        // OpenGL only public functions
+
         /**
          * Sets the target image format. Use <code>false</code> for SDL and
          * <code>true</code> for OpenGL.
@@ -150,20 +184,40 @@ class Image : public Resource
         static int getTextureType() { return mTextureType; }
 #endif
 
-        /**
-         * Merges two image SDL_Surfaces together. This is for SDL use only, as
-         * reducing the number of surfaces that SDL has to render can cut down
-         * on the number of blit operations necessary, which in turn can help
-         * improve overall framerates. Don't use unless you are using it to
-         * reduce the number of overall layers that need to be drawn through SDL.
-         */
-        Image *merge(Image *image, int x, int y);
-
     protected:
+
+      // -----------------------
+      // Generic protected members
+      // -----------------------
+
+        SDL_Rect mBounds;
+        bool mLoaded;
+        float mAlpha;
+        bool mHasAlphaChannel;
+
+      // -----------------------
+      // SDL protected members
+      // -----------------------
+
+        /** SDL Constructor */
+        Image(SDL_Surface *image, bool hasAlphaChannel = false,
+              Uint8 *alphaChannel = NULL);
+
+        /** SDL_Surface to SDL_Surface Image loader */
+        static Image *_SDLload(SDL_Surface *tmpImage);
+
+        SDL_Surface *mSDLSurface;
+
+        /** Alpha Channel pointer used for 32bit based SDL surfaces */
+        Uint8 *mAlphaChannel;
+
+      // -----------------------
+      // OpenGL protected members
+      // -----------------------
+#ifdef USE_OPENGL
         /**
-         * Constructor.
+         * OpenGL Constructor.
          */
-#ifdef USE_OPENGL
         Image(GLuint glimage, int width, int height,
               int texWidth, int texHeight);
 
@@ -171,13 +225,9 @@ class Image : public Resource
          * Returns the first power of two equal or bigger than the input.
          */
         static int powerOfTwo(int input);
-#endif
-        Image(SDL_Surface *image);
 
-        SDL_Rect mBounds;
-        bool mLoaded;
+        static Image *_GLload(SDL_Surface *tmpImage);
 
-#ifdef USE_OPENGL
         GLuint mGLImage;
         int mTexWidth, mTexHeight;
 
@@ -185,8 +235,6 @@ class Image : public Resource
         static int mTextureType;
         static int mTextureSize;
 #endif
-        SDL_Surface *mImage;
-        float mAlpha;
 };
 
 /**