Never allow crosshair to be drawn

DrBeef · DrBeef · commit 3d9775bb0b2f · 2020-05-29T09:46:46.000+01:00
it doesn't make sense in VR
diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/g_statusbar/shared_sbar.cpp b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/g_statusbar/shared_sbar.cpp
@@ -132,7 +132,7 @@ CUSTOM_CVAR(Bool, hud_aspectscale, false, CVAR_ARCHIVE)
 	}
 }
 
-CVAR (Bool, crosshairon, true, CVAR_ARCHIVE);
+CVAR (Bool, crosshairon, false, CVAR_ARCHIVE);
 CVAR (Int, crosshair, 0, CVAR_ARCHIVE)
 CVAR (Bool, crosshairforce, false, CVAR_ARCHIVE)
 CVAR (Color, crosshaircolor, 0xff0000, CVAR_ARCHIVE);
@@ -898,7 +898,8 @@ void DBaseStatusBar::DrawCrosshair ()
 	double size;
 	int w, h;
 
-	if (!crosshairon)
+	//Never draw the crosshair in VR - it doesn't make sense!
+	//if (!crosshairon)
 	{
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ CUSTOM_CVAR(Bool, hud_aspectscale, false, CVAR_ARCHIVE)`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`-CVAR (Bool, crosshairon, true, CVAR_ARCHIVE);`
	`135`	`+CVAR (Bool, crosshairon, false, CVAR_ARCHIVE);`
`136`	`136`	`CVAR (Int, crosshair, 0, CVAR_ARCHIVE)`
`137`	`137`	`CVAR (Bool, crosshairforce, false, CVAR_ARCHIVE)`
`138`	`138`	`CVAR (Color, crosshaircolor, 0xff0000, CVAR_ARCHIVE);`
`@@ -898,7 +898,8 @@ void DBaseStatusBar::DrawCrosshair ()`
`898`	`898`	`double size;`
`899`	`899`	`int w, h;`
`900`	`900`
`901`		`- if (!crosshairon)`
	`901`	`+ //Never draw the crosshair in VR - it doesn't make sense!`
	`902`	`+ //if (!crosshairon)`
`902`	`903`	`{`
`903`	`904`	`return;`
`904`	`905`	`}`