Fix opengl issue and insert mouse grab line in --help
authortheoddone33 <theoddone33@c79c8604-0f32-0410-912e-ea7021435596>
Tue, 7 May 2002 04:55:38 +0000 (04:55 +0000)
committertheoddone33 <theoddone33@c79c8604-0f32-0410-912e-ea7021435596>
Tue, 7 May 2002 04:55:38 +0000 (04:55 +0000)
git-svn-id: svn://svn.icculus.org/hhexen/trunk@12 c79c8604-0f32-0410-912e-ea7021435596

base/i_linux.c
opengl/ogl_tex.c

index 9930395..e0ee727 100644 (file)
@@ -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");
index 5f5de0e..8e89dbd 100644 (file)
@@ -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.