From 5e994635777d7a4d5330e1c1fc0bf971e3000259 Mon Sep 17 00:00:00 2001 From: Steven Fuller Date: Mon, 10 Dec 2001 01:28:06 +0000 Subject: [PATCH] GL_EXT_secondary_color now spelled correctly (Tim Beckmann) Progress Bar drawing hopefully fixed. --- src/main.c | 6 +++--- src/opengl.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index bda9492..065f194 100644 --- a/src/main.c +++ b/src/main.c @@ -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);