diff options
| author | oy <Tom_Adams@web.de> | 2011-12-04 14:17:05 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-12-04 14:17:05 +0100 |
| commit | 0fdc9c1b8e3e08623c3359a2d3bd863b95f9e0a6 (patch) | |
| tree | 9e4a83ea6fd170681bf98c15b5574b6a2e0eefc8 /src/engine/client | |
| parent | b99ac459bea247f2a2474b345b1dd69e4bd59a69 (diff) | |
| download | zcatch-0fdc9c1b8e3e08623c3359a2d3bd863b95f9e0a6.tar.gz zcatch-0fdc9c1b8e3e08623c3359a2d3bd863b95f9e0a6.zip | |
cleaned up few things
Diffstat (limited to 'src/engine/client')
| -rw-r--r-- | src/engine/client/graphics.cpp | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp index d1f0b8a8..a6b1a47a 100644 --- a/src/engine/client/graphics.cpp +++ b/src/engine/client/graphics.cpp @@ -5,19 +5,7 @@ #include <base/math.h> #include "SDL.h" - -#ifdef CONF_FAMILY_WINDOWS - #define WIN32_LEAN_AND_MEAN - #include <windows.h> -#endif - -#ifdef CONF_PLATFORM_MACOSX - #include <OpenGL/gl.h> - #include <OpenGL/glu.h> -#else - #include <GL/gl.h> - #include <GL/glu.h> -#endif +#include "SDL_opengl.h" #include <base/system.h> #include <engine/external/pnglite/pnglite.h> @@ -32,13 +20,6 @@ #include "graphics.h" -// compressed textures -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 - -#define TEXTURE_MAX_ANISOTROPY_EXT 0x84FE - static CVideoMode g_aFakeModes[] = { {320,240,8,8,8}, {400,300,8,8,8}, {640,480,8,8,8}, @@ -743,19 +724,14 @@ bool CGraphics_OpenGL::Init() int CGraphics_SDL::TryInit() { - const SDL_VideoInfo *pInfo; - int Flags = SDL_OPENGL; - m_ScreenWidth = g_Config.m_GfxScreenWidth; m_ScreenHeight = g_Config.m_GfxScreenHeight; - pInfo = SDL_GetVideoInfo(); + const SDL_VideoInfo *pInfo = SDL_GetVideoInfo(); SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE); // set flags - Flags = SDL_OPENGL; - Flags |= SDL_GL_DOUBLEBUFFER; - Flags |= SDL_HWPALETTE; + int Flags = SDL_OPENGL; if(g_Config.m_DbgResizable) Flags |= SDL_RESIZABLE; |