From a91ef00a8697ae24a7d3311247601bcf804399a4 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Thu, 24 Dec 2015 04:01:28 +0000
Subject: [PATCH] Move DbgNoCompressPigBitmap to CArg

---
 common/include/args.h  | 2 +-
 similar/main/piggy.cpp | 6 +++---
 similar/misc/args.cpp  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/include/args.h b/common/include/args.h
index ffe690fed..1bd331199 100644
--- a/common/include/args.h
+++ b/common/include/args.h
@@ -108,6 +108,7 @@ struct CArg : prohibit_void_ptr<CArg>
 #endif
 	bool DbgNoRun;
 	bool DbgNoDoubleBuffer;
+	bool DbgNoCompressPigBitmap;
 	bool DbgRenderStats;
 	uint8_t DbgBpp;
 	int8_t DbgVerbose;
@@ -148,7 +149,6 @@ struct Arg : prohibit_void_ptr<Arg>
 #endif
 	std::string DbgAltTex;
 	std::string DbgTexMap;
-	bool DbgNoCompressPigBitmap;
 };
 
 extern struct Arg GameArg;
diff --git a/similar/main/piggy.cpp b/similar/main/piggy.cpp
index 0038b250d..67213ff2b 100644
--- a/similar/main/piggy.cpp
+++ b/similar/main/piggy.cpp
@@ -281,7 +281,7 @@ bitmap_index piggy_register_bitmap( grs_bitmap * bmp, const char * name, int in_
 			swap_0_255( bmp );
 #endif
 #endif
-		if (GameArg.DbgNoCompressPigBitmap)
+		if (CGameArg.DbgNoCompressPigBitmap)
 			gr_bitmap_rle_compress(*bmp);
 	}
 #if defined(DXX_BUILD_DESCENT_II)
@@ -859,7 +859,7 @@ void piggy_new_pigfile(char *pigname)
 					if ( GameArg.EdiMacData )
 						swap_0_255( bm[fnum].get() );
 
-					if (GameArg.DbgNoCompressPigBitmap)
+					if (CGameArg.DbgNoCompressPigBitmap)
 						gr_bitmap_rle_compress(*bm[fnum].get());
 
 					if (bm[fnum]->bm_flags & BM_FLAG_RLE)
@@ -905,7 +905,7 @@ void piggy_new_pigfile(char *pigname)
 				if ( GameArg.EdiMacData )
 					swap_0_255( &n );
 
-				if (GameArg.DbgNoCompressPigBitmap)
+				if (CGameArg.DbgNoCompressPigBitmap)
 					gr_bitmap_rle_compress(n);
 
 				if (n.bm_flags & BM_FLAG_RLE)
diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp
index 747fcc13d..e2c41073d 100644
--- a/similar/misc/args.cpp
+++ b/similar/misc/args.cpp
@@ -364,7 +364,7 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args)
 		else if (!d_stricmp(p, "-nodoublebuffer"))
 			CGameArg.DbgNoDoubleBuffer = true;
 		else if (!d_stricmp(p, "-bigpig"))
-			GameArg.DbgNoCompressPigBitmap 		= 1;
+			CGameArg.DbgNoCompressPigBitmap = true;
 		else if (!d_stricmp(p, "-16bpp"))
 			CGameArg.DbgBpp		= 16;