From 4c8f0d2edf4b9013c55a6f3a166f55efcd710f74 Mon Sep 17 00:00:00 2001 From: theoddone33 Date: Tue, 7 May 2002 04:55:38 +0000 Subject: [PATCH] Fix opengl issue and insert mouse grab line in --help git-svn-id: svn://svn.icculus.org/hhexen/trunk@12 c79c8604-0f32-0410-912e-ea7021435596 --- base/i_linux.c | 3 ++- opengl/ogl_tex.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/base/i_linux.c b/base/i_linux.c index 9930395..e0ee727 100644 --- a/base/i_linux.c +++ b/base/i_linux.c @@ -1700,8 +1700,9 @@ void PrintHelp(char *name) printf (" [ -f | --fullscreen] Run the game fullscreen\n"); printf (" [ -w | --windowed] Run the game windowed\n"); printf (" [ -s | --nosound] Run the game without sound\n"); + printf (" [ -g | --nograb] Disable mouse grabbing\n"); #ifdef RENDER3D - printf (" [ -g | --gllibrary] Select 3D rendering library\n"); + //printf (" [ -l | --gllibrary] Select 3D rendering library\n"); #endif printf ("\n"); printf ("You can use the HHEXEN_DATA environment variable to force the\n"); diff --git a/opengl/ogl_tex.c b/opengl/ogl_tex.c index 5f5de0e..8e89dbd 100644 --- a/opengl/ogl_tex.c +++ b/opengl/ogl_tex.c @@ -352,8 +352,8 @@ unsigned int OGL_PrepareTexture(int idx) memset(rgbaflat, 0, 4*tex->width*tex->height); textype = DrawRealPatch(rgbflat, rgbaflat, palette, tex->width, tex->height, W_CacheLumpNum(tex->patches[0].patch, PU_CACHE), false); - if(textype == GL_RGBA) rgbflat = rgbaflat; - free (rgbaflat); + if(textype == GL_RGBA) { free(rgbflat); rgbflat = rgbaflat; } + else { free (rgbaflat); } } // Generate and bind the texture. -- 2.39.2