Loaded images now converted to display format for speed, and added support

for masking on magic pink.

2 files changed, 7 insertions, 1 deletions

diff --git a/data/core/graphics/gui/textbox.png b/data/core/graphics/gui/textbox.png
index 487ed3cb..ccfb2bb1 100644
--- a/data/core/graphics/gui/textbox.png
+++ b/data/core/graphics/gui/textbox.png
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index f3af2790..624036cf 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -25,6 +25,7 @@
 #include "image.h"
 #include <iostream>
 #include <SDL_image.h>
+#include "../graphic/graphic.h"
 
 Image::Image(SDL_Surface *image):
     image(image)
@@ -42,7 +43,12 @@ Image* Image::load(const std::string &filePath)
     std::cout << "Image::load(" << filePath << ")\n";
 #endif
     // Attempt to use SDL_Image to load the file.
-    SDL_Surface *image = IMG_Load(filePath.c_str());
+    SDL_Surface *tmpImage = IMG_Load(filePath.c_str());
+    SDL_Surface *image = SDL_ConvertSurface(
+            tmpImage, screen->format, SDL_SWSURFACE);
+    SDL_FreeSurface(tmpImage);
+    SDL_SetColorKey(image, SDL_SRCCOLORKEY | SDL_RLEACCEL,
+            SDL_MapRGB(image->format, 255, 0, 255));
 
     // Check if the file was opened and return the appropriate value.
     if (!image) {