From 6382b04afb219ff096f30c3b2e2474b5ea13f7bc Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Thu, 14 Apr 2022 21:45:46 +0200 Subject: [PATCH] When disabled weapon wheel control schema is used, assign ALT to grip instead of empty function --- android/app/src/main/cpp/code/q3_ui/ui_controls3.c | 2 +- android/app/src/main/cpp/code/ui/ui_main.c | 2 +- android/app/src/main/cpp/code/vr/vr_base.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/cpp/code/q3_ui/ui_controls3.c b/android/app/src/main/cpp/code/q3_ui/ui_controls3.c index ad98ec70..b7171d61 100644 --- a/android/app/src/main/cpp/code/q3_ui/ui_controls3.c +++ b/android/app/src/main/cpp/code/q3_ui/ui_controls3.c @@ -216,7 +216,7 @@ static void Controls3_MenuEvent( void* ptr, int notification ) { } else { trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev"); // previous weapon } - trap_Cvar_Set("vr_button_map_PRIMARYGRIP", ""); // unmapped + trap_Cvar_Set("vr_button_map_PRIMARYGRIP", "+alt"); // switch to alt layout trap_Cvar_Set("vr_button_map_PRIMARYTHUMBSTICK", ""); // unmapped trap_Cvar_Set("vr_button_map_RTHUMBFORWARD_ALT", ""); // unmapped trap_Cvar_Set("vr_button_map_RTHUMBFORWARDRIGHT", ""); // unmapped diff --git a/android/app/src/main/cpp/code/ui/ui_main.c b/android/app/src/main/cpp/code/ui/ui_main.c index 80199bef..51d169ce 100644 --- a/android/app/src/main/cpp/code/ui/ui_main.c +++ b/android/app/src/main/cpp/code/ui/ui_main.c @@ -3231,7 +3231,7 @@ static void UI_Update(const char *name) { } else { trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev"); // previous weapon } - trap_Cvar_Set("vr_button_map_PRIMARYGRIP", ""); // unmapped + trap_Cvar_Set("vr_button_map_PRIMARYGRIP", "+alt"); // switch to alt layout trap_Cvar_Set("vr_button_map_PRIMARYTHUMBSTICK", ""); // unmapped trap_Cvar_Set("vr_button_map_RTHUMBFORWARD_ALT", ""); // unmapped trap_Cvar_Set("vr_button_map_RTHUMBFORWARDRIGHT", ""); // unmapped diff --git a/android/app/src/main/cpp/code/vr/vr_base.c b/android/app/src/main/cpp/code/vr/vr_base.c index 46490d47..6eca402b 100644 --- a/android/app/src/main/cpp/code/vr/vr_base.c +++ b/android/app/src/main/cpp/code/vr/vr_base.c @@ -163,7 +163,7 @@ void VR_InitCvars( void ) } else { Cvar_Get ("vr_button_map_RTHUMBBACK", "weapprev", CVAR_ARCHIVE); // previous weapon } - Cvar_Get ("vr_button_map_PRIMARYGRIP", "", CVAR_ARCHIVE); // unmapped + Cvar_Get ("vr_button_map_PRIMARYGRIP", "+alt", CVAR_ARCHIVE); // switch to alt layout Cvar_Get ("vr_button_map_PRIMARYTHUMBSTICK", "", CVAR_ARCHIVE); // unmapped Cvar_Get ("vr_button_map_RTHUMBFORWARD_ALT", "", CVAR_ARCHIVE); // unmapped Cvar_Get ("vr_button_map_RTHUMBFORWARDRIGHT", "", CVAR_ARCHIVE); // unmapped