From d10b4d9c2c08820715b7ee2dac718497e82988a6 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Fri, 24 Nov 2023 19:57:02 +0000
Subject: [PATCH] Fixes for scope on android

---
 Projects/Android/AndroidManifest.xml                  |  2 +-
 .../jni/OpenJK/JKXR/android/JKXR_SurfaceView.cpp      | 11 ++++++-----
 .../Android/jni/OpenJK/code/qcommon/stv_version.h     |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 64e6c20..3619440 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.jkxr"
 		android:versionCode="64"
-		android:versionName="1.1.19" android:installLocation="auto" >
+		android:versionName="1.1.20" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030002" android:required="true"/>
diff --git a/Projects/Android/jni/OpenJK/JKXR/android/JKXR_SurfaceView.cpp b/Projects/Android/jni/OpenJK/JKXR/android/JKXR_SurfaceView.cpp
index 06cad00..642ba90 100644
--- a/Projects/Android/jni/OpenJK/JKXR/android/JKXR_SurfaceView.cpp
+++ b/Projects/Android/jni/OpenJK/JKXR/android/JKXR_SurfaceView.cpp
@@ -59,7 +59,7 @@ bool VR_UseScreenLayer()
 			(bool)((vr.cin_camera && !vr.immersive_cinematics) ||
 			vr.misc_camera ||
 			(CL_IsRunningInGameCinematic() || CL_InGameCinematicOnStandBy()) ||
-            (cls.state == CA_DISCONNECTED) ||
+//            (cls.state == CA_DISCONNECTED) ||
             (cls.state == CA_CINEMATIC) ||
             (cls.state == CA_LOADING) ||
             ( Key_GetCatcher( ) & KEYCATCH_UI ) ||
@@ -152,7 +152,7 @@ void VR_SetHMDOrientation(float pitch, float yaw, float roll)
 	//Keep this for our records
 	VectorCopy(vr.hmdorientation, vr.hmdorientation_last);
 
-	if (!vr.third_person && !vr.remote_npc && !vr.remote_turret
+	if (!vr.third_person && !vr.remote_npc && !vr.remote_turret && !vr.cgzoommode
 #ifndef JK2_MODE
 		&& !vr.in_vehicle
 #endif
@@ -161,7 +161,7 @@ void VR_SetHMDOrientation(float pitch, float yaw, float roll)
 		VectorCopy(vr.hmdorientation, vr.hmdorientation_first);
 	}
 
-	if (!vr.remote_turret)
+	if (!vr.remote_turret && !vr.cgzoommode)
 	{
 		VectorCopy(vr.weaponangles[ANGLES_ADJUSTED], vr.weaponangles_first[ANGLES_ADJUSTED]);
 	}
@@ -239,7 +239,8 @@ void VR_GetMove(float *forward, float *side, float *pos_forward, float *pos_side
 		*up = 0.0f;
 		*side = remote_movementSideways / 3.0f;
 		*pos_side = 0.0f;
-		*yaw = vr.snapTurn;
+		*yaw = vr.snapTurn + vr.hmdorientation_first[YAW] +
+                             vr.weaponangles[ANGLES_ADJUSTED][YAW] - vr.weaponangles_first[ANGLES_ADJUSTED][YAW];
 		*pitch = vr.weaponangles[ANGLES_ADJUSTED][PITCH];
 		*roll = 0.0f;//vr.hmdorientation[ROLL];
 	}
@@ -330,7 +331,7 @@ void VR_Init()
 	vr_positional_factor = Cvar_Get( "vr_positional_factor", "12", CVAR_ARCHIVE);
     vr_walkdirection = Cvar_Get( "vr_walkdirection", "1", CVAR_ARCHIVE);
 	vr_weapon_pitchadjust = Cvar_Get( "vr_weapon_pitchadjust", "-20.0", CVAR_ARCHIVE);
-	vr_saber_pitchadjust = Cvar_Get( "vr_saber_pitchadjust", "-25.0", CVAR_ARCHIVE);
+	vr_saber_pitchadjust = Cvar_Get( "vr_saber_pitchadjust", "-13.36", CVAR_ARCHIVE);
     vr_virtual_stock = Cvar_Get( "vr_virtual_stock", "0", CVAR_ARCHIVE);
 
     //Defaults
diff --git a/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h b/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
index d42f39d..efde73c 100644
--- a/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
+++ b/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
@@ -23,7 +23,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 // Current version of the single player game
 #include "../win32/AutoVersion.h"
 
-#define JKXR_VERSION		"1.1.19-ea"
+#define JKXR_VERSION		"1.1.20-ea"
 
 #ifdef _DEBUG
 	#define	Q3_VERSION		"(debug)OpenJK: v" VERSION_STRING_DOTTED "  JKXR: " JKXR_VERSION