From 0d68350b10b4ba2d17505d9a37c91185175cafd5 Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Tue, 12 Apr 2022 22:34:42 +0200 Subject: [PATCH] Enable prev/next weapon switch only if weapon wheel is disabled --- android/app/src/main/cpp/code/q3_ui/ui_controls3.c | 14 ++++++++------ android/app/src/main/cpp/code/ui/ui_main.c | 14 ++++++++------ android/app/src/main/cpp/code/vr/vr_base.c | 8 ++++---- 3 files changed, 20 insertions(+), 16 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 d0ad8187..ad98ec70 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 @@ -144,9 +144,11 @@ static void Controls3_MenuEvent( void* ptr, int notification ) { } } else { if (s_controls3.controlschema.curvalue == 1) { - trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "weapprev"); - } else { + trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "blank"); + } else if (s_controls3.controlschema.curvalue == 2) { trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev"); + } else { + trap_Cvar_Set("vr_button_map_RTHUMBBACK", "blank"); } } } @@ -160,11 +162,11 @@ static void Controls3_MenuEvent( void* ptr, int notification ) { case 0: // Default schema (weapon wheel on grip) trap_Cvar_Set("vr_button_map_RTHUMBLEFT", "turnleft"); // turn left trap_Cvar_Set("vr_button_map_RTHUMBRIGHT", "turnright"); // turn right - trap_Cvar_Set("vr_button_map_RTHUMBFORWARD", "weapnext"); // next weapon + trap_Cvar_Set("vr_button_map_RTHUMBFORWARD", ""); // unmapped if (s_controls3.uturn.curvalue) { trap_Cvar_Set("vr_button_map_RTHUMBBACK", "uturn"); // u-turn } else { - trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev"); // previous weapon + trap_Cvar_Set("vr_button_map_RTHUMBBACK", ""); // unmapped } trap_Cvar_Set("vr_button_map_PRIMARYGRIP", "+weapon_select"); // weapon selector trap_Cvar_Set("vr_button_map_PRIMARYTHUMBSTICK", ""); // unmapped @@ -194,11 +196,11 @@ static void Controls3_MenuEvent( void* ptr, int notification ) { trap_Cvar_Set("vr_button_map_PRIMARYGRIP", "+alt"); // switch to alt layout trap_Cvar_Set("vr_button_map_RTHUMBLEFT_ALT", "turnleft"); // turn left trap_Cvar_Set("vr_button_map_RTHUMBRIGHT_ALT", "turnright"); // turn right - trap_Cvar_Set("vr_button_map_RTHUMBFORWARD_ALT", "weapnext"); + trap_Cvar_Set("vr_button_map_RTHUMBFORWARD_ALT", "blank"); if (s_controls3.uturn.curvalue) { trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "uturn"); } else { - trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "weapprev"); + trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "blank"); } trap_Cvar_Set("vr_button_map_RTHUMBFORWARDRIGHT_ALT", "blank"); // unmapped trap_Cvar_Set("vr_button_map_RTHUMBBACKRIGHT_ALT", "blank"); // 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 e0e27f0d..80199bef 100644 --- a/android/app/src/main/cpp/code/ui/ui_main.c +++ b/android/app/src/main/cpp/code/ui/ui_main.c @@ -3177,11 +3177,11 @@ static void UI_Update(const char *name) { case 0: // Default schema (weapon wheel on grip) trap_Cvar_Set("vr_button_map_RTHUMBLEFT", "turnleft"); // turn left trap_Cvar_Set("vr_button_map_RTHUMBRIGHT", "turnright"); // turn right - trap_Cvar_Set("vr_button_map_RTHUMBFORWARD", "weapnext"); // next weapon + trap_Cvar_Set("vr_button_map_RTHUMBFORWARD", ""); // unmapped if (uturn) { trap_Cvar_Set("vr_button_map_RTHUMBBACK", "uturn"); // u-turn } else { - trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev"); // previous weapon + trap_Cvar_Set("vr_button_map_RTHUMBBACK", ""); // unmapped } trap_Cvar_Set("vr_button_map_PRIMARYGRIP", "+weapon_select"); // weapon selector trap_Cvar_Set("vr_button_map_PRIMARYTHUMBSTICK", ""); // unmapped @@ -3211,11 +3211,11 @@ static void UI_Update(const char *name) { trap_Cvar_Set("vr_button_map_PRIMARYGRIP", "+alt"); // switch to alt layout trap_Cvar_Set("vr_button_map_RTHUMBLEFT_ALT", "turnleft"); // turn left trap_Cvar_Set("vr_button_map_RTHUMBRIGHT_ALT", "turnright"); // turn right - trap_Cvar_Set("vr_button_map_RTHUMBFORWARD_ALT", "weapnext"); + trap_Cvar_Set("vr_button_map_RTHUMBFORWARD_ALT", "blank"); if (uturn) { trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "uturn"); } else { - trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "weapprev"); + trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "blank"); } trap_Cvar_Set("vr_button_map_RTHUMBFORWARDRIGHT_ALT", "blank"); // unmapped trap_Cvar_Set("vr_button_map_RTHUMBBACKRIGHT_ALT", "blank"); // unmapped @@ -3257,9 +3257,11 @@ static void UI_Update(const char *name) { } } else { if (controlSchema == 1) { - trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "weapprev"); - } else { + trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "blank"); + } else if (controlSchema == 2) { trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev"); + } else { + trap_Cvar_Set("vr_button_map_RTHUMBBACK", ""); } } } else if (Q_stricmp(name, "vr_goreLevel") == 0) { 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 127714ec..46490d47 100644 --- a/android/app/src/main/cpp/code/vr/vr_base.c +++ b/android/app/src/main/cpp/code/vr/vr_base.c @@ -109,11 +109,11 @@ void VR_InitCvars( void ) // Default schema (weapon wheel on grip) Cvar_Get ("vr_button_map_RTHUMBLEFT", "turnleft", CVAR_ARCHIVE); // turn left Cvar_Get ("vr_button_map_RTHUMBRIGHT", "turnright", CVAR_ARCHIVE); // turn right - Cvar_Get ("vr_button_map_RTHUMBFORWARD", "weapnext", CVAR_ARCHIVE); // next weapon + Cvar_Get ("vr_button_map_RTHUMBFORWARD", "", CVAR_ARCHIVE); // unmapped if (uturnEnabled) { Cvar_Get ("vr_button_map_RTHUMBBACK", "uturn", CVAR_ARCHIVE); // u-turn } else { - Cvar_Get ("vr_button_map_RTHUMBBACK", "weapprev", CVAR_ARCHIVE); // previous weapon + Cvar_Get ("vr_button_map_RTHUMBBACK", "", CVAR_ARCHIVE); // unmapped } Cvar_Get ("vr_button_map_PRIMARYGRIP", "+weapon_select", CVAR_ARCHIVE); // weapon selector Cvar_Get ("vr_button_map_PRIMARYTHUMBSTICK", "", CVAR_ARCHIVE); // unmapped @@ -143,11 +143,11 @@ void VR_InitCvars( void ) Cvar_Get ("vr_button_map_PRIMARYGRIP", "+alt", CVAR_ARCHIVE); // switch to alt layout Cvar_Get ("vr_button_map_RTHUMBLEFT_ALT", "turnleft", CVAR_ARCHIVE); // turn left Cvar_Get ("vr_button_map_RTHUMBRIGHT_ALT", "turnright", CVAR_ARCHIVE); // turn right - Cvar_Get ("vr_button_map_RTHUMBFORWARD_ALT", "weapnext", CVAR_ARCHIVE); + Cvar_Get ("vr_button_map_RTHUMBFORWARD_ALT", "blank", CVAR_ARCHIVE); if (uturnEnabled) { Cvar_Get ("vr_button_map_RTHUMBBACK_ALT", "uturn", CVAR_ARCHIVE); } else { - Cvar_Get ("vr_button_map_RTHUMBBACK_ALT", "weapprev", CVAR_ARCHIVE); + Cvar_Get ("vr_button_map_RTHUMBBACK_ALT", "blank", CVAR_ARCHIVE); } Cvar_Get ("vr_button_map_RTHUMBFORWARDRIGHT_ALT", "blank", CVAR_ARCHIVE); // unmapped Cvar_Get ("vr_button_map_RTHUMBBACKRIGHT_ALT", "blank", CVAR_ARCHIVE); // unmapped