From ba0815355ef7be8e5f46720be5a6911e466e1568 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 25 Aug 2013 13:19:23 +0300
Subject: add SurfaceImageHelper for loading/processing surfaces for SDL2.

For SDL1.2 used SDLImageHelper.
---
 src/client.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 02719debc..72da13128 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -88,7 +88,7 @@
 #include "resources/imagehelper.h"
 #include "resources/openglimagehelper.h"
 #include "resources/palettedb.h"
-#include "resources/sdlimagehelper.h"
+#include "resources/surfaceimagehelper.h"
 #include "resources/sounddb.h"
 #include "resources/itemdb.h"
 #include "resources/mapdb.h"
@@ -565,13 +565,14 @@ void Client::gameInit()
 #ifdef USE_OPENGL
     openGLMode = config.getIntValue("opengl");
     OpenGLImageHelper::setBlur(config.getBoolValue("blur"));
-    SDLImageHelper::SDLSetEnableAlphaCache(config.getBoolValue("alphaCache")
-        && !openGLMode);
+    SurfaceImageHelper::SDLSetEnableAlphaCache(
+        config.getBoolValue("alphaCache") && !openGLMode);
     ImageHelper::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f
         || openGLMode);
 #else
     openGLMode = 0;
-    SDLImageHelper::SDLSetEnableAlphaCache(config.getBoolValue("alphaCache"));
+    SurfaceImageHelper::SDLSetEnableAlphaCache(
+        config.getBoolValue("alphaCache"));
     ImageHelper::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f);
 #endif
     logVars();
@@ -802,9 +803,9 @@ void Client::gameClear()
     delete mainGraphics;
     mainGraphics = nullptr;
 
-    if (imageHelper != sdlImageHelper)
-        delete sdlImageHelper;
-    sdlImageHelper = nullptr;
+    if (imageHelper != surfaceImageHelper)
+        delete surfaceImageHelper;
+    surfaceImageHelper = nullptr;
     delete imageHelper;
     imageHelper = nullptr;
 
-- 
cgit v1.2.3-70-g09d2