From b5e1628dbf9cbf77b38c2a9685a9e66368cb02ab Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Fri, 11 Mar 2022 20:34:13 +0000
Subject: [PATCH] Fix issue with weapon wheel cursor locking to one side or
 other

---
 android/app/src/main/AndroidManifest.xml         | 4 ++--
 android/app/src/main/cpp/code/cgame/cg_weapons.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bccc3c7b..b7803dfb 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.drbeef.ioq3quest"
 	android:installLocation="preferExternal"
-	android:versionCode="30"
-	android:versionName="0.21.1">
+	android:versionCode="31"
+	android:versionName="0.21.2">
 	<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
 	<uses-feature android:glEsVersion="0x00030001" />
 	<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->
diff --git a/android/app/src/main/cpp/code/cgame/cg_weapons.c b/android/app/src/main/cpp/code/cgame/cg_weapons.c
index 7a5a2494..d4f9a14f 100644
--- a/android/app/src/main/cpp/code/cgame/cg_weapons.c
+++ b/android/app/src/main/cpp/code/cgame/cg_weapons.c
@@ -2074,7 +2074,7 @@ void CG_DrawHolsteredWeapons( void )
 	VectorMA(holsterOrigin, ((DIST*2.0f)*frac), holsterForward, holsterOrigin);
     VectorCopy(holsterOrigin, selectorOrigin);
 
-    float x = ((holsterAngles[YAW] - controllerAngles[YAW]) / 22.5f);
+    float x = (sinf(DEG2RAD(holsterAngles[YAW] - controllerAngles[YAW])) / sinf(DEG2RAD(22.5f)));
     float y = ((holsterAngles[PITCH] - controllerAngles[PITCH]) / 22.5f);
     float len = length(x, y);
     if (len > 1.0f)