From 44ae14c363dc33b9f3ba6960ce8e24b85e85fe6d Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Sun, 22 Jul 2007 20:56:23 +0000
Subject: [PATCH] Even more FindArg cleanups

---
 arch/ogl/sdlgl.c | 2 +-
 include/args.h   | 2 +-
 main/args.c      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/ogl/sdlgl.c b/arch/ogl/sdlgl.c
index 5584994b8..cce3cc958 100755
--- a/arch/ogl/sdlgl.c
+++ b/arch/ogl/sdlgl.c
@@ -46,7 +46,7 @@ int ogl_init_window(int x, int y){
 	}
 	SDL_WM_SetCaption(DESCENT_VERSION, "Descent");
 
-        if (!SDL_SetVideoMode(x,y, GameArg.GlBpp, SDL_OPENGL | (ogl_fullscreen?SDL_FULLSCREEN:0))) {
+        if (!SDL_SetVideoMode(x,y, GameArg.DbgGlBpp, SDL_OPENGL | (ogl_fullscreen?SDL_FULLSCREEN:0))) {
            Error("Could not set %dx%dx16 opengl video mode\n",x,y);
         }
 	
diff --git a/include/args.h b/include/args.h
index 7abf907de..84ef6ca98 100755
--- a/include/args.h
+++ b/include/args.h
@@ -91,7 +91,7 @@ typedef struct Arg
 	int DbgBigPig;
 #ifdef OGL
 	int DbgAltTexMerge;
-	int DbgBpp;
+	int DbgGlBpp;
 #endif
 } __attribute__ ((packed)) Arg;
 
diff --git a/main/args.c b/main/args.c
index 965255d26..2791ec436 100755
--- a/main/args.c
+++ b/main/args.c
@@ -405,9 +405,9 @@ void ReadCmdArgs(void)
 		GameArg.DbgAltTexMerge = 1;
 
 	if (FindArg("-gl_16bpp"))
-		GameArg.GlBpp = 16;
+		GameArg.DbgGlBpp = 16;
 	else
-		GameArg.GlBpp = 32;
+		GameArg.DbgGlBpp = 32;
 #endif
 }