diff options
| author | jacob1 <jfu614@gmail.com> | 2013-07-17 22:20:50 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-07-17 22:20:50 (GMT) |
| commit | cc887995c0881d728e13fbdfe0757e0fa256bce0 (patch) | |
| tree | 405817784ccad3e3a65f8e06609d60c5b3b2393c /src | |
| parent | a98fb2092df8edd44917edfb97225f3611219721 (diff) | |
| download | powder-cc887995c0881d728e13fbdfe0757e0fa256bce0.zip powder-cc887995c0881d728e13fbdfe0757e0fa256bce0.tar.gz | |
fix openGL compiling (most likely), fixes #146
Diffstat (limited to 'src')
| -rw-r--r-- | src/PowderToySDL.cpp | 2 | ||||
| -rw-r--r-- | src/graphics/OpenGLDrawMethods.inl | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index 0f79d9e..cacc38d 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -422,6 +422,7 @@ void EngineProcess() break; #ifdef OGLI case SDL_VIDEORESIZE: + { float ratio = float(XRES+BARSIZE) / float(YRES+MENUSIZE); float width = event.resize.w; float height = width/ratio; @@ -442,6 +443,7 @@ void EngineProcess() std::cerr << "Oh bugger" << std::endl; } break; + } #endif #if defined (USE_SDL) && defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) case SDL_SYSWMEVENT: diff --git a/src/graphics/OpenGLDrawMethods.inl b/src/graphics/OpenGLDrawMethods.inl index 52d09da..44dc705 100644 --- a/src/graphics/OpenGLDrawMethods.inl +++ b/src/graphics/OpenGLDrawMethods.inl @@ -414,3 +414,8 @@ void PIXELMETHODS_CLASS::draw_image(pixel *img, int x, int y, int w, int h, int glBindTexture(GL_TEXTURE_2D, 0); glDisable(GL_TEXTURE_2D); } + +void PIXELMETHODS_CLASS::draw_image(VideoBuffer * vidBuf, int x, int y, int a) +{ + draw_image(vidBuf->Buffer, x, y, vidBuf->Width, vidBuf->Height, a); +} |