diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-12-10 01:28:06 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:37 +0200 |
| commit | 5e994635777d7a4d5330e1c1fc0bf971e3000259 (patch) | |
| tree | add26e6c2444cd00095ae464f4d1dcd689a287d0 /src | |
| parent | 7501334b9b5b3f82211ed1acff6c16bc63da1d48 (diff) | |
GL_EXT_secondary_color now spelled correctly (Tim Beckmann)
Progress Bar drawing hopefully fixed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 6 | ||||
| -rw-r--r-- | src/opengl.c | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -506,8 +506,8 @@ int SetOGLVideoMode(int Width, int Height) #if GL_EXT_secondary_color pglSecondaryColorPointerEXT = NULL; - if (CheckToken(ext, "GL_EXT_seconary_color")) { - printf("Found GL_EXT_seconary_color... "); + if (CheckToken(ext, "GL_EXT_secondary_color")) { + printf("Found GL_EXT_secondary_color... "); pglSecondaryColorPointerEXT = SDL_GL_GetProcAddress("glSecondaryColorPointerEXT"); if (pglSecondaryColorPointerEXT == NULL) { @@ -516,7 +516,7 @@ int SetOGLVideoMode(int Width, int Height) printf("and it's good!\n"); } } else { - printf("GL_EXT_seconary_color not found...\n"); + printf("GL_EXT_secondary_color not found...\n"); } #endif diff --git a/src/opengl.c b/src/opengl.c index 7bffa6a..351c9c8 100644 --- a/src/opengl.c +++ b/src/opengl.c @@ -2506,10 +2506,12 @@ void BltImage(RECT *dest, DDSurface *image, RECT *src) height = dest->bottom - dest->top + 1; height1 = src->bottom - src->top + 1; - glPushAttrib(GL_COLOR_BUFFER_BIT | GL_PIXEL_MODE_BIT); + glPushAttrib(GL_COLOR_BUFFER_BIT | GL_PIXEL_MODE_BIT | GL_DEPTH_BUFFER_BIT | GL_ENABLE_BIT); glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); glDisable(GL_BLEND); + glDisable(GL_DEPTH_TEST); + glDisable(GL_TEXTURE_2D); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ROW_LENGTH, image->w); |