diff options
| author | David Athay <ko2fan@gmail.com> | 2009-02-11 09:30:26 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-02-11 09:30:26 +0000 |
| commit | 91111ca5d13072ea3b834e23835df9c077329e39 (patch) | |
| tree | f0af8dd08b766164835cf9b5412a9aa3267dbad7 /src/openglgraphics.cpp | |
| parent | 8046bb2626b30fecdcea54eb0aa3349cdb7d277b (diff) | |
| parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
| download | mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.gz mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.bz2 mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.xz mana-client-91111ca5d13072ea3b834e23835df9c077329e39.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/openglgraphics.cpp')
| -rw-r--r-- | src/openglgraphics.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 01208c36..e7e7b204 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -19,30 +19,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "main.h" - -#ifdef USE_OPENGL - -#ifndef GL_TEXTURE_RECTANGLE_ARB -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif +#include <SDL.h> +#include "log.h" #include "openglgraphics.h" -#include <cstring> -#include <SDL.h> +#include "resources/image.h" #ifdef __APPLE__ #include <OpenGL/OpenGL.h> #endif -#include <guichan/exception.hpp> -#include <guichan/image.hpp> - -#include "log.h" +#ifdef USE_OPENGL -#include "resources/image.h" +#ifndef GL_TEXTURE_RECTANGLE_ARB +#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 +#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 +#endif OpenGLGraphics::OpenGLGraphics(): mAlpha(false), mTexture(false), mColorAlpha(false), |