Move SubImage class to separate file.

7 files changed, 222 insertions, 140 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 39a4d7a87..bdca0a37b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -437,6 +437,8 @@ SET(SRCS
     resources/soundeffect.cpp
     resources/spritedef.h
     resources/spritedef.cpp
+    resources/subimage.cpp
+    resources/subimage.h
     resources/wallpaper.cpp
     resources/wallpaper.h
     utils/translation/podict.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 518e82a7d..38cbeecde 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -447,10 +447,12 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      resources/resource.h \
 	      resources/resourcemanager.cpp \
 	      resources/resourcemanager.h \
-	      resources/soundeffect.h \
 	      resources/soundeffect.cpp \
-	      resources/spritedef.h \
+	      resources/soundeffect.h \
 	      resources/spritedef.cpp \
+	      resources/spritedef.h \
+	      resources/subimage.cpp \
+	      resources/subimage.h \
 	      resources/wallpaper.cpp \
 	      resources/wallpaper.h \
 	      utils/translation/podict.cpp \
diff --git a/src/map.cpp b/src/map.cpp
index 43c5f406d..516ae833c 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -35,6 +35,7 @@
 #include "resources/ambientlayer.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
+#include "resources/subimage.h"
 
 #include "gui/widgets/chattab.h"
 
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 0e0937ce6..5496a10d8 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -37,6 +37,7 @@
 #include "utils/stringutils.h"
 
 #include "resources/imagehelper.h"
+#include "resources/subimage.h"
 
 #include <SDL_image.h>
 #include <SDL_rotozoom.h>
@@ -335,106 +336,3 @@ void Image::SDLTerminateAlphaCache()
     SDLCleanCache();
     mUseAlphaCache = false;
 }
-
-//============================================================================
-// SubImage Class
-//============================================================================
-
-SubImage::SubImage(Image *parent, SDL_Surface *image,
-                   int x, int y, int width, int height):
-    Image(image),
-    mParent(parent)
-{
-    if (mParent)
-    {
-        mParent->incRef();
-        mParent->SDLTerminateAlphaCache();
-        mHasAlphaChannel = mParent->hasAlphaChannel();
-        mIsAlphaVisible = mHasAlphaChannel;
-        mAlphaChannel = mParent->SDLgetAlphaChannel();
-    }
-    else
-    {
-        mHasAlphaChannel = false;
-        mIsAlphaVisible = false;
-        mAlphaChannel = nullptr;
-    }
-
-    // Set up the rectangle.
-    mBounds.x = static_cast<short>(x);
-    mBounds.y = static_cast<short>(y);
-    mBounds.w = static_cast<Uint16>(width);
-    mBounds.h = static_cast<Uint16>(height);
-    if (mParent)
-    {
-        mInternalBounds.x = mParent->mBounds.x;
-        mInternalBounds.y = mParent->mBounds.y;
-        mInternalBounds.w = mParent->mBounds.w;
-        mInternalBounds.h = mParent->mBounds.h;
-    }
-    else
-    {
-        mInternalBounds.x = 0;
-        mInternalBounds.y = 0;
-        mInternalBounds.w = 1;
-        mInternalBounds.h = 1;
-    }
-    mUseAlphaCache = false;
-}
-
-#ifdef USE_OPENGL
-SubImage::SubImage(Image *parent, GLuint image,
-                   int x, int y, int width, int height,
-                   int texWidth, int texHeight):
-    Image(image, width, height, texWidth, texHeight),
-    mParent(parent)
-{
-    if (mParent)
-        mParent->incRef();
-
-    // Set up the rectangle.
-    mBounds.x = static_cast<short>(x);
-    mBounds.y = static_cast<short>(y);
-    mBounds.w = static_cast<Uint16>(width);
-    mBounds.h = static_cast<Uint16>(height);
-    if (mParent)
-    {
-        mInternalBounds.x = mParent->mBounds.x;
-        mInternalBounds.y = mParent->mBounds.y;
-        mInternalBounds.w = mParent->mBounds.w;
-        mInternalBounds.h = mParent->mBounds.h;
-    }
-    else
-    {
-        mInternalBounds.x = 0;
-        mInternalBounds.y = 0;
-        mInternalBounds.w = 1;
-        mInternalBounds.h = 1;
-    }
-    mIsAlphaVisible = mHasAlphaChannel;
-}
-#endif
-
-SubImage::~SubImage()
-{
-    // Avoid destruction of the image
-    mSDLSurface = nullptr;
-    // Avoid possible destruction of its alpha channel
-    mAlphaChannel = nullptr;
-#ifdef USE_OPENGL
-    mGLImage = 0;
-#endif
-    if (mParent)
-    {
-        mParent->decRef();
-        mParent = nullptr;
-    }
-}
-
-Image *SubImage::getSubImage(int x, int y, int w, int h)
-{
-    if (mParent)
-        return mParent->getSubImage(mBounds.x + x, mBounds.y + y, w, h);
-    else
-        return nullptr;
-}
diff --git a/src/resources/image.h b/src/resources/image.h
index 2a3f16c85..4bee1f0ed 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -211,39 +211,4 @@ class Image : public Resource
 #endif
 };
 
-/**
- * A clipped version of a larger image.
- */
-class SubImage : public Image
-{
-    public:
-        /**
-         * Constructor.
-         */
-        SubImage(Image *parent, SDL_Surface *image,
-                 int x, int y, int width, int height);
-#ifdef USE_OPENGL
-        SubImage(Image *parent, GLuint image, int x, int y,
-                 int width, int height, int texWidth, int textHeight);
-#endif
-
-        /**
-         * Destructor.
-         */
-        ~SubImage();
-
-        /**
-         * Creates a new image with the desired clipping rectangle.
-         *
-         * @return <code>NULL</code> if creation failed and a valid
-         *         image otherwise.
-         */
-        Image *getSubImage(int x, int y, int width, int height);
-
-        SDL_Rect mInternalBounds;
-
-    private:
-        Image *mParent;
-};
-
 #endif
diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp
new file mode 100644
index 000000000..895bdc9a7
--- /dev/null
+++ b/src/resources/subimage.cpp
@@ -0,0 +1,134 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/subimage.h"
+
+#ifdef USE_OPENGL
+#include "openglgraphics.h"
+#include "opengl1graphics.h"
+#endif
+
+#include "client.h"
+#include "main.h"
+
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+SubImage::SubImage(Image *parent, SDL_Surface *image,
+                   int x, int y, int width, int height):
+    Image(image),
+    mParent(parent)
+{
+    if (mParent)
+    {
+        mParent->incRef();
+        mParent->SDLTerminateAlphaCache();
+        mHasAlphaChannel = mParent->hasAlphaChannel();
+        mIsAlphaVisible = mHasAlphaChannel;
+        mAlphaChannel = mParent->SDLgetAlphaChannel();
+    }
+    else
+    {
+        mHasAlphaChannel = false;
+        mIsAlphaVisible = false;
+        mAlphaChannel = nullptr;
+    }
+
+    // Set up the rectangle.
+    mBounds.x = static_cast<short>(x);
+    mBounds.y = static_cast<short>(y);
+    mBounds.w = static_cast<Uint16>(width);
+    mBounds.h = static_cast<Uint16>(height);
+    if (mParent)
+    {
+        mInternalBounds.x = mParent->mBounds.x;
+        mInternalBounds.y = mParent->mBounds.y;
+        mInternalBounds.w = mParent->mBounds.w;
+        mInternalBounds.h = mParent->mBounds.h;
+    }
+    else
+    {
+        mInternalBounds.x = 0;
+        mInternalBounds.y = 0;
+        mInternalBounds.w = 1;
+        mInternalBounds.h = 1;
+    }
+    mUseAlphaCache = false;
+}
+
+#ifdef USE_OPENGL
+SubImage::SubImage(Image *parent, GLuint image,
+                   int x, int y, int width, int height,
+                   int texWidth, int texHeight):
+    Image(image, width, height, texWidth, texHeight),
+    mParent(parent)
+{
+    if (mParent)
+        mParent->incRef();
+
+    // Set up the rectangle.
+    mBounds.x = static_cast<short>(x);
+    mBounds.y = static_cast<short>(y);
+    mBounds.w = static_cast<Uint16>(width);
+    mBounds.h = static_cast<Uint16>(height);
+    if (mParent)
+    {
+        mInternalBounds.x = mParent->mBounds.x;
+        mInternalBounds.y = mParent->mBounds.y;
+        mInternalBounds.w = mParent->mBounds.w;
+        mInternalBounds.h = mParent->mBounds.h;
+    }
+    else
+    {
+        mInternalBounds.x = 0;
+        mInternalBounds.y = 0;
+        mInternalBounds.w = 1;
+        mInternalBounds.h = 1;
+    }
+    mIsAlphaVisible = mHasAlphaChannel;
+}
+#endif
+
+SubImage::~SubImage()
+{
+    // Avoid destruction of the image
+    mSDLSurface = nullptr;
+    // Avoid possible destruction of its alpha channel
+    mAlphaChannel = nullptr;
+#ifdef USE_OPENGL
+    mGLImage = 0;
+#endif
+    if (mParent)
+    {
+        mParent->decRef();
+        mParent = nullptr;
+    }
+}
+
+Image *SubImage::getSubImage(int x, int y, int w, int h)
+{
+    if (mParent)
+        return mParent->getSubImage(mBounds.x + x, mBounds.y + y, w, h);
+    else
+        return nullptr;
+}
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
new file mode 100644
index 000000000..1ff268288
--- /dev/null
+++ b/src/resources/subimage.h
@@ -0,0 +1,80 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SUBIMAGE_H
+#define SUBIMAGE_H
+
+#include "localconsts.h"
+#include "main.h"
+
+#include <SDL.h>
+
+#ifdef USE_OPENGL
+
+/* The definition of OpenGL extensions by SDL is giving problems with recent
+ * gl.h headers, since they also include these definitions. As we're not using
+ * extensions anyway it's safe to just disable the SDL version.
+ */
+//#define NO_SDL_GLEXT
+#define GL_GLEXT_PROTOTYPES 1
+
+#include <SDL_opengl.h>
+#endif
+
+#include "resources/image.h"
+
+/**
+ * A clipped version of a larger image.
+ */
+class SubImage : public Image
+{
+    public:
+        /**
+         * Constructor.
+         */
+        SubImage(Image *parent, SDL_Surface *image,
+                 int x, int y, int width, int height);
+#ifdef USE_OPENGL
+        SubImage(Image *parent, GLuint image, int x, int y,
+                 int width, int height, int texWidth, int textHeight);
+#endif
+
+        /**
+         * Destructor.
+         */
+        ~SubImage();
+
+        /**
+         * Creates a new image with the desired clipping rectangle.
+         *
+         * @return <code>NULL</code> if creation failed and a valid
+         *         image otherwise.
+         */
+        Image *getSubImage(int x, int y, int width, int height);
+
+        SDL_Rect mInternalBounds;
+
+    private:
+        Image *mParent;
+};
+
+#endif