Changed around recent additions to Image class a bit and fixed OpenGL compile.

3 files changed, 44 insertions, 42 deletions

diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index cefb9d88..314de573 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -44,11 +44,6 @@ Image::Image(GLuint image, int width, int height, int texWidth, int texHeight):
     alpha = 1.0f;
 }
 
-Image::Image():image(image)
-{
-   alpha = 1.0f;
-}
-
 Image::~Image()
 {
     unload();
@@ -225,6 +220,24 @@ Image* Image::load(const char* buffer, unsigned int bufferSize)
 #endif
 }
 
+Image *Image::create(int width, int height)
+{
+#ifndef USE_OPENGL
+    SDL_Surface *surf =
+        SDL_AllocSurface(SDL_SWSURFACE, width, height, 32, 0, 0, 0, 0);
+
+    if (surf) {
+        return new Image(surf);
+    }
+    else {
+        return NULL;
+    }
+#else
+    return NULL;
+#endif
+}
+
+
 void Image::unload()
 {
     // Free the image surface.
@@ -366,26 +379,19 @@ float Image::getAlpha()
     return alpha;
 }
 
-bool Image::create(int width, int height)
+void Image::fillWithColor(
+        unsigned char red, unsigned char green, unsigned blue)
 {
-   image = SDL_AllocSurface(SDL_SWSURFACE, width, height, 32, 0, 0, 0, 0);
-   if ( image )
-       return true;
-   else
-       return false;
-}
-
-void Image::fillWithColor(unsigned char red, unsigned char green, unsigned blue)
-{
-   Uint32 boxColor = SDL_MapRGB(SDL_GetVideoSurface()->format, red, green, blue);
-   if ( image )
-   {    
+#ifndef USE_OPENGL
+   if (image) {
+       Uint32 boxColor = SDL_MapRGB(image->format, red, green, blue);
        SDL_Rect sourceRect;
        sourceRect.x = sourceRect.y = 0;
        sourceRect.w = image->w;
        sourceRect.h = image->h;
        SDL_FillRect(image, &sourceRect, boxColor);
    }
+#endif
 }
 
 //============================================================================
diff --git a/src/resources/image.h b/src/resources/image.h
index 084bb211..f5869167 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -47,22 +47,6 @@ class Image : public Resource
 {
     public:
         /**
-         * Constructor.
-         */
-#ifdef USE_OPENGL
-        Image(GLuint image,
-                int width, int height,
-                int texWidth, int texHeight);
-#else
-        Image(SDL_Surface *image);
-#endif
-
-        /**
-         * Two time intialization Contructor. For now : Only to be used with create.
-         */
-        Image();        
-
-        /**
          * Destructor.
          */
         virtual ~Image();
@@ -92,6 +76,11 @@ class Image : public Resource
         static Image *load(const char* buffer, unsigned int bufferSize);
 
         /**
+         * Creates a new empty image with given height and width.
+         */
+        static Image *create(int width, int height);
+
+        /**
          * Frees the resources created by SDL.
          */
         virtual void unload();
@@ -149,17 +138,24 @@ class Image : public Resource
         float getAlpha();
 
         /**
-         * Creates a new empty image with given height and width.
-         */
-        bool create(int width, int height);
-
-        /**
          * Fills the image with given color.
          */
-        void fillWithColor(unsigned char red, unsigned char green, unsigned blue);
+        void fillWithColor(
+                unsigned char red, unsigned char green, unsigned blue);
 
 
     protected:
+        /**
+         * Constructor.
+         */
+#ifdef USE_OPENGL
+        Image(GLuint image,
+                int width, int height,
+                int texWidth, int texHeight);
+#else
+        Image(SDL_Surface *image);
+#endif
+
 #ifdef USE_OPENGL
         GLuint image;
         int width, height;
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 13cbc4d6..e40aa723 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -201,7 +201,7 @@ void ResourceManager::searchAndAddZipFiles()
         std::string filePath = std::string("data/") +
             std::string(findFileInfo.name);
 
-        std::cout << "Adding to PhysicsFS: " << findFileInfo.name << std::endl;
+        log("Adding to PhysicsFS: %s", findFileInfo.name);
 
         // Add the zip file to our PhysicsFS search path
         PHYSFS_addToSearchPath(filePath.c_str(), 1);
@@ -234,7 +234,7 @@ void ResourceManager::searchAndAddZipFiles()
             std::string filePath = std::string(programPath) +
                 std::string("/") + std::string(direntry->d_name);
 
-            std::cout << "Adding to PhysicsFS: " << filePath << std::endl;
+            log("Adding to PhysicsFS: %s", filePath.c_str());
 
             // Add the zip file to our PhysicsFS search path
             PHYSFS_addToSearchPath(filePath.c_str(), 1);