summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-07-19 21:32:43 +0300
committerAndrei Karas <akaras@inbox.ru>2012-07-19 21:32:43 +0300
commit08f911af478cb3bbede503a3e704b61da713b74e (patch)
tree9bb352abc64bdc0eb1a08baa7b6f42d5b0c440be /src/resources
parent4503b047574e1374d16d2bec7e10285f59cc6d51 (diff)
downloadManaVerse-08f911af478cb3bbede503a3e704b61da713b74e.tar.gz
ManaVerse-08f911af478cb3bbede503a3e704b61da713b74e.tar.bz2
ManaVerse-08f911af478cb3bbede503a3e704b61da713b74e.tar.xz
ManaVerse-08f911af478cb3bbede503a3e704b61da713b74e.zip
Rename openglgraphics to normalopenglgraphics.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.cpp2
-rw-r--r--src/resources/image.h2
-rw-r--r--src/resources/openglimagehelper.cpp4
-rw-r--r--src/resources/subimage.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 342bca1b5..4b5fa4f40 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -26,7 +26,7 @@
#include "resources/resourcemanager.h"
#ifdef USE_OPENGL
-#include "openglgraphics.h"
+#include "normalopenglgraphics.h"
#include "safeopenglgraphics.h"
#endif
diff --git a/src/resources/image.h b/src/resources/image.h
index 756c9e23d..84895125c 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -59,7 +59,7 @@ class Image : public Resource
friend class OpenGLImageHelper;
friend class SDLImageHelper;
#ifdef USE_OPENGL
- friend class OpenGLGraphics;
+ friend class NormalOpenGLGraphics;
friend class SafeOpenGLGraphics;
#endif
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 120288b3f..841f9b3ae 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -27,7 +27,7 @@
#include "resources/dye.h"
#include "resources/resourcemanager.h"
-#include "openglgraphics.h"
+#include "normalopenglgraphics.h"
#include "safeopenglgraphics.h"
#include "client.h"
@@ -213,7 +213,7 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage)
GLuint texture;
glGenTextures(1, &texture);
if (mUseOpenGL == 1)
- OpenGLGraphics::bindTexture(mTextureType, texture);
+ NormalOpenGLGraphics::bindTexture(mTextureType, texture);
else if (mUseOpenGL == 2)
SafeOpenGLGraphics::bindTexture(mTextureType, texture);
diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp
index 1b9f745d3..2f4104580 100644
--- a/src/resources/subimage.cpp
+++ b/src/resources/subimage.cpp
@@ -23,7 +23,7 @@
#include "resources/subimage.h"
#ifdef USE_OPENGL
-#include "openglgraphics.h"
+#include "normalopenglgraphics.h"
#include "safeopenglgraphics.h"
#endif