diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-07-19 21:15:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-07-19 21:15:55 +0300 |
| commit | 4503b047574e1374d16d2bec7e10285f59cc6d51 (patch) | |
| tree | d7efb46c3154b2dd1487751d18c4a2f91ec87c07 /src/resources | |
| parent | c4acdd1997b5bdc7b70e52ea90354ee65f15360a (diff) | |
| download | manaverse-4503b047574e1374d16d2bec7e10285f59cc6d51.tar.gz manaverse-4503b047574e1374d16d2bec7e10285f59cc6d51.tar.bz2 manaverse-4503b047574e1374d16d2bec7e10285f59cc6d51.tar.xz manaverse-4503b047574e1374d16d2bec7e10285f59cc6d51.zip | |
Rename opengl1graphics to safeopenglgraphics.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/image.cpp | 2 | ||||
| -rw-r--r-- | src/resources/image.h | 2 | ||||
| -rw-r--r-- | src/resources/openglimagehelper.cpp | 4 | ||||
| -rw-r--r-- | src/resources/subimage.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index c642980af..342bca1b5 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -27,7 +27,7 @@ #ifdef USE_OPENGL #include "openglgraphics.h" -#include "opengl1graphics.h" +#include "safeopenglgraphics.h" #endif #include "client.h" diff --git a/src/resources/image.h b/src/resources/image.h index 59178cca6..756c9e23d 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -60,7 +60,7 @@ class Image : public Resource friend class SDLImageHelper; #ifdef USE_OPENGL friend class OpenGLGraphics; - friend class OpenGL1Graphics; + friend class SafeOpenGLGraphics; #endif public: diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index ae3b55741..120288b3f 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -28,7 +28,7 @@ #include "resources/resourcemanager.h" #include "openglgraphics.h" -#include "opengl1graphics.h" +#include "safeopenglgraphics.h" #include "client.h" #include "logger.h" @@ -215,7 +215,7 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage) if (mUseOpenGL == 1) OpenGLGraphics::bindTexture(mTextureType, texture); else if (mUseOpenGL == 2) - OpenGL1Graphics::bindTexture(mTextureType, texture); + SafeOpenGLGraphics::bindTexture(mTextureType, texture); if (SDL_MUSTLOCK(tmpImage)) SDL_LockSurface(tmpImage); diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp index 294a966c4..1b9f745d3 100644 --- a/src/resources/subimage.cpp +++ b/src/resources/subimage.cpp @@ -24,7 +24,7 @@ #ifdef USE_OPENGL #include "openglgraphics.h" -#include "opengl1graphics.h" +#include "safeopenglgraphics.h" #endif #include "client.h" |