fix last commit, debugmenu options

solomonbstoner · Jan 8, 2021 · 02f6ed7 · 02f6ed7
1 parent 39a1213
commit 02f6ed7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
@@ -218,10 +218,10 @@ void LoadINISettings()
 #ifdef PROPER_SCALING
 	CDraw::ms_bProperScaling = CheckAndReadIniInt("Draw", "ProperScaling", CDraw::ms_bProperScaling);	
 #endif
-#ifdef FIX_SPRITES
+#ifdef FIX_RADAR
 	CDraw::ms_bFixRadar      = CheckAndReadIniInt("Draw", "FixRadar", CDraw::ms_bFixRadar);	
 #endif
-#ifdef FIX_RADAR
+#ifdef FIX_SPRITES
 	CDraw::ms_bFixSprites    = CheckAndReadIniInt("Draw", "FixSprites", CDraw::ms_bFixSprites);	
 #endif
 }
@@ -265,10 +265,10 @@ void SaveINISettings()
 #ifdef PROPER_SCALING	
 	CheckAndSaveIniInt("Draw", "ProperScaling", CDraw::ms_bProperScaling, changed);	
 #endif
-#ifdef FIX_SPRITES
+#ifdef FIX_RADAR
 	CheckAndSaveIniInt("Draw", "FixRadar", CDraw::ms_bFixRadar, changed);
 #endif
-#ifdef FIX_RADAR
+#ifdef FIX_SPRITES
 	CheckAndSaveIniInt("Draw", "FixSprites", CDraw::ms_bFixSprites, changed);	
 #endif
 
@@ -636,6 +636,18 @@ extern bool gbRenderWorld2;
 		DebugMenuAddVarBool8("Render", "Don't render Vehicles", &gbDontRenderVehicles, nil);
 		DebugMenuAddVarBool8("Render", "Don't render Objects", &gbDontRenderObjects, nil);
 		DebugMenuAddVarBool8("Render", "Don't Render Water", &gbDontRenderWater, nil);
+
+#ifdef PROPER_SCALING	
+		DebugMenuAddVarBool8("Draw", "Proper Scaling", &CDraw::ms_bProperScaling, nil);
+#endif
+#ifdef FIX_RADAR
+		DebugMenuAddVarBool8("Draw", "Fix Radar", &CDraw::ms_bFixRadar, nil);
+#endif
+#ifdef FIX_SPRITES
+		DebugMenuAddVarBool8("Draw", "Fix Sprites", &CDraw::ms_bFixSprites, nil);
+#endif
+
+
 
 #ifndef FINAL
 		DebugMenuAddVarBool8("Debug", "Print Memory Usage", &gbPrintMemoryUsage, nil);

diff --git a/src/render/Draw.cpp b/src/render/Draw.cpp
@@ -21,13 +21,13 @@ uint8 CDraw::FadeGreen;
 uint8 CDraw::FadeBlue;
 
 #ifdef PROPER_SCALING	
-int32 CDraw::ms_bProperScaling = true;
+bool CDraw::ms_bProperScaling = true;
 #endif
-#ifdef FIX_SPRITES
-int32 CDraw::ms_bFixRadar = true;	
+#ifdef  FIX_RADAR
+bool CDraw::ms_bFixRadar = true;	
 #endif
-#ifdef FIX_RADAR
-int32 CDraw::ms_bFixSprites = true;	
+#ifdef FIX_SPRITES
+bool CDraw::ms_bFixSprites = true;	
 #endif
 
 float

diff --git a/src/render/Draw.h b/src/render/Draw.h
@@ -36,13 +36,13 @@ class CDraw
 	static uint8 FadeBlue;
 
 #ifdef PROPER_SCALING	
-	static int32 ms_bProperScaling;
-#endif
-#ifdef FIX_SPRITES
-	static int32 ms_bFixRadar;	
+	static bool ms_bProperScaling;
 #endif
 #ifdef FIX_RADAR
-	static int32 ms_bFixSprites;	
+	static bool ms_bFixRadar;	
+#endif
+#ifdef FIX_SPRITES
+	static bool ms_bFixSprites;	
 #endif
 
 	static void SetNearClipZ(float nearclip) { ms_fNearClipZ = nearclip; }