From fa17246b7bec4a7f3bd1ec82d97f68e27476d9fa Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Fri, 18 Dec 2015 04:08:24 +0000
Subject: [PATCH] Move DbgGlLuminance4Alpha4Ok to CArg

---
 common/include/args.h    | 2 +-
 similar/arch/ogl/gr.cpp  | 2 +-
 similar/arch/ogl/ogl.cpp | 2 +-
 similar/misc/args.cpp    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/include/args.h b/common/include/args.h
index bb90115c9..6ed97e832 100644
--- a/common/include/args.h
+++ b/common/include/args.h
@@ -87,6 +87,7 @@ struct CArg : prohibit_void_ptr<CArg>
 	bool DbgGlIntensity4Ok;
 	bool DbgGlReadPixelsOk;
 	bool DbgGlGetTexLevelParamOk;
+	bool DbgGlLuminance4Alpha4Ok;
 #endif
 	uint8_t DbgBpp;
 	int DbgVerbose;
@@ -147,7 +148,6 @@ struct Arg : prohibit_void_ptr<Arg>
 	bool DbgNoDoubleBuffer;
 	bool DbgNoCompressPigBitmap;
 #ifdef OGL
-	int DbgGlLuminance4Alpha4Ok;
 	int DbgGlRGBA2Ok;
 #else
 	int DbgSdlHWSurface;
diff --git a/similar/arch/ogl/gr.cpp b/similar/arch/ogl/gr.cpp
index 23200da92..342b13555 100644
--- a/similar/arch/ogl/gr.cpp
+++ b/similar/arch/ogl/gr.cpp
@@ -565,7 +565,7 @@ static void ogl_get_verinfo(void)
 #endif
 
 #ifndef NDEBUG
-	con_printf(CON_VERBOSE,"gl_intensity4:%i gl_luminance4_alpha4:%i gl_rgba2:%i gl_readpixels:%i gl_gettexlevelparam:%i", CGameArg.DbgGlIntensity4Ok, GameArg.DbgGlLuminance4Alpha4Ok, GameArg.DbgGlRGBA2Ok, CGameArg.DbgGlReadPixelsOk, CGameArg.DbgGlGetTexLevelParamOk);
+	con_printf(CON_VERBOSE,"gl_intensity4:%i gl_luminance4_alpha4:%i gl_rgba2:%i gl_readpixels:%i gl_gettexlevelparam:%i", CGameArg.DbgGlIntensity4Ok, CGameArg.DbgGlLuminance4Alpha4Ok, GameArg.DbgGlRGBA2Ok, CGameArg.DbgGlReadPixelsOk, CGameArg.DbgGlGetTexLevelParamOk);
 #endif
 	const auto gl_extensions = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
 	if (!d_stricmp(gl_extensions,"GL_EXT_texture_filter_anisotropic")==0)
diff --git a/similar/arch/ogl/ogl.cpp b/similar/arch/ogl/ogl.cpp
index 16cf82914..26bc15ea5 100644
--- a/similar/arch/ogl/ogl.cpp
+++ b/similar/arch/ogl/ogl.cpp
@@ -164,7 +164,7 @@ void ogl_init_texture(ogl_texture &t, int w, int h, int flags)
 				t.internalformat = GL_INTENSITY4;
 				t.format = GL_LUMINANCE;
 			}
-			else if (GameArg.DbgGlLuminance4Alpha4Ok)
+			else if (CGameArg.DbgGlLuminance4Alpha4Ok)
 			{
 				t.internalformat = GL_LUMINANCE4_ALPHA4;
 				t.format = GL_LUMINANCE_ALPHA;
diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp
index 81dc87f80..5b9c80f2d 100644
--- a/similar/misc/args.cpp
+++ b/similar/misc/args.cpp
@@ -174,7 +174,7 @@ static void InitGameArg()
 	GameArg.OglSyncMethod 		= OGL_SYNC_METHOD_DEFAULT;
 	GameArg.OglSyncWait		= OGL_SYNC_WAIT_DEFAULT;
 	CGameArg.DbgGlIntensity4Ok 	= true;
-	GameArg.DbgGlLuminance4Alpha4Ok = 1;
+	CGameArg.DbgGlLuminance4Alpha4Ok = true;
 	GameArg.DbgGlRGBA2Ok 		= 1;
 	CGameArg.DbgGlReadPixelsOk = true;
 	CGameArg.DbgGlGetTexLevelParamOk = true;
@@ -374,7 +374,7 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args)
 		else if (!d_stricmp(p, "-gl_intensity4_ok"))
 			CGameArg.DbgGlIntensity4Ok = arg_integer(pp, end);
 		else if (!d_stricmp(p, "-gl_luminance4_alpha4_ok"))
-			GameArg.DbgGlLuminance4Alpha4Ok                        = arg_integer(pp, end);
+			CGameArg.DbgGlLuminance4Alpha4Ok = arg_integer(pp, end);
 		else if (!d_stricmp(p, "-gl_rgba2_ok"))
 			GameArg.DbgGlRGBA2Ok 			                       = arg_integer(pp, end);
 		else if (!d_stricmp(p, "-gl_readpixels_ok"))