From 5cd7e2adeb316aacf03ac82ca7f9b7c62c2befaf Mon Sep 17 00:00:00 2001
From: Petr Bartos <petr.bartos@plus4u.net>
Date: Fri, 8 Apr 2022 18:13:46 +0200
Subject: [PATCH] Weapon selector fixes

---
 android/app/src/main/cpp/code/cgame/cg_weapons.c | 11 +++++++++--
 android/app/src/main/cpp/code/vr/vr_clientinfo.h |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

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 25423f7b..1cb06830 100644
--- a/android/app/src/main/cpp/code/cgame/cg_weapons.c
+++ b/android/app/src/main/cpp/code/cgame/cg_weapons.c
@@ -1868,6 +1868,11 @@ void CG_DrawWeaponSelect( void ) {
 		return;
 	}
 
+	// don't display when weapon wheel is opened
+	if (vr->weapon_select) {
+		return;
+	}
+
 	color = CG_FadeColor( cg.weaponSelectTime, WEAPON_SELECT_TIME );
 	if ( !color ) {
 		return;
@@ -2120,7 +2125,8 @@ void CG_DrawWeaponSelector( void )
     float thumbstickAxisX = 0.0f;
     float thumbstickAxisY = 0.0f;
 	float a = atan2(vr->thumbstick_location[thumb][0], vr->thumbstick_location[thumb][1]);
-    if (length(vr->thumbstick_location[thumb][0], vr->thumbstick_location[thumb][1]) > 0.95f)
+	float thumbstickValue = length(vr->thumbstick_location[thumb][0], vr->thumbstick_location[thumb][1]);
+    if (thumbstickValue > 0.95f)
     {
         thumbstickAxisX = sinf(a) * 0.95f;
         thumbstickAxisY = cosf(a) * 0.95f;
@@ -2390,12 +2396,13 @@ void CG_DrawWeaponSelector( void )
 	// In case was invoked by thumbstick axis and thumbstick is centered
 	// select weapon (if any selected) and close the selector
 	if (vr->weapon_select_autoclose && frac > 0.25f) {
-	    if (thumbstickAxisX > -0.1f && thumbstickAxisX < 0.1f && thumbstickAxisY > -0.1f && thumbstickAxisY < 0.1f) {
+	    if (thumbstickValue < 0.1f) {
 	        if (selected) {
 	            cg.weaponSelect = cg.weaponSelectorSelection;
 	        }
 	    	vr->weapon_select = qfalse;
             vr->weapon_select_autoclose = qfalse;
+            vr->weapon_select_using_thumbstick = qfalse;
 	    }
 	}
 }
diff --git a/android/app/src/main/cpp/code/vr/vr_clientinfo.h b/android/app/src/main/cpp/code/vr/vr_clientinfo.h
index 51a2aa4e..083309f3 100644
--- a/android/app/src/main/cpp/code/vr/vr_clientinfo.h
+++ b/android/app/src/main/cpp/code/vr/vr_clientinfo.h
@@ -24,6 +24,7 @@ typedef struct {
     vrFollowMode_t follow_mode;
     qboolean weapon_select;
     qboolean weapon_select_autoclose;
+    qboolean weapon_select_using_thumbstick;
     qboolean no_crosshair;
 
     int realign; // used to realign the fake 6DoF playspace in a multiplayer game