teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-03-08 18:31:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable prev/next weapon switch only if weapon wheel is disabled

Browse source
This commit is contained in:
Petr Bartos 2022-04-12 22:34:42 +02:00 committed by Simon
parent 82f9736f5d
commit 0d68350b10
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/app/src/main/cpp/code/q3_ui/ui_controls3.c
View file

@ -144,9 +144,11 @@ static void Controls3_MenuEvent( void* ptr, int notification ) {
} }
} else { } else {
if (s_controls3.controlschema.curvalue == 1) { if (s_controls3.controlschema.curvalue == 1) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "weapprev"); trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "blank");
} else { } else if (s_controls3.controlschema.curvalue == 2) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev"); 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) case 0: // Default schema (weapon wheel on grip)
trap_Cvar_Set("vr_button_map_RTHUMBLEFT", "turnleft"); // turn left 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_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) { if (s_controls3.uturn.curvalue) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK", "uturn"); // u-turn trap_Cvar_Set("vr_button_map_RTHUMBBACK", "uturn"); // u-turn
} else { } 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_PRIMARYGRIP", "+weapon_select"); // weapon selector
trap_Cvar_Set("vr_button_map_PRIMARYTHUMBSTICK", ""); // unmapped 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_PRIMARYGRIP", "+alt"); // switch to alt layout
trap_Cvar_Set("vr_button_map_RTHUMBLEFT_ALT", "turnleft"); // turn left 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_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) { if (s_controls3.uturn.curvalue) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "uturn"); trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "uturn");
} else { } 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_RTHUMBFORWARDRIGHT_ALT", "blank"); // unmapped
trap_Cvar_Set("vr_button_map_RTHUMBBACKRIGHT_ALT", "blank"); // unmapped trap_Cvar_Set("vr_button_map_RTHUMBBACKRIGHT_ALT", "blank"); // unmapped

14
android/app/src/main/cpp/code/ui/ui_main.c
View file

@ -3177,11 +3177,11 @@ static void UI_Update(const char *name) {
case 0: // Default schema (weapon wheel on grip) case 0: // Default schema (weapon wheel on grip)
trap_Cvar_Set("vr_button_map_RTHUMBLEFT", "turnleft"); // turn left 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_RTHUMBRIGHT", "turnright"); // turn right
trap_Cvar_Set("vr_button_map_RTHUMBFORWARD", "weapnext"); // next weapon trap_Cvar_Set("vr_button_map_RTHUMBFORWARD", ""); // unmapped
if (uturn) { if (uturn) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK", "uturn"); // u-turn trap_Cvar_Set("vr_button_map_RTHUMBBACK", "uturn"); // u-turn
} else { } 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_PRIMARYGRIP", "+weapon_select"); // weapon selector
trap_Cvar_Set("vr_button_map_PRIMARYTHUMBSTICK", ""); // unmapped 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_PRIMARYGRIP", "+alt"); // switch to alt layout
trap_Cvar_Set("vr_button_map_RTHUMBLEFT_ALT", "turnleft"); // turn left 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_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) { if (uturn) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "uturn"); trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "uturn");
} else { } 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_RTHUMBFORWARDRIGHT_ALT", "blank"); // unmapped
trap_Cvar_Set("vr_button_map_RTHUMBBACKRIGHT_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 { } else {
if (controlSchema == 1) { if (controlSchema == 1) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "weapprev"); trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "blank");
} else { } else if (controlSchema == 2) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev"); trap_Cvar_Set("vr_button_map_RTHUMBBACK", "weapprev");
} else {
trap_Cvar_Set("vr_button_map_RTHUMBBACK", "");
} }
} }
} else if (Q_stricmp(name, "vr_goreLevel") == 0) { } else if (Q_stricmp(name, "vr_goreLevel") == 0) {

8
android/app/src/main/cpp/code/vr/vr_base.c
View file

@ -109,11 +109,11 @@ void VR_InitCvars( void )
// Default schema (weapon wheel on grip) // Default schema (weapon wheel on grip)
Cvar_Get ("vr_button_map_RTHUMBLEFT", "turnleft", CVAR_ARCHIVE); // turn left 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_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) { if (uturnEnabled) {
Cvar_Get ("vr_button_map_RTHUMBBACK", "uturn", CVAR_ARCHIVE); // u-turn Cvar_Get ("vr_button_map_RTHUMBBACK", "uturn", CVAR_ARCHIVE); // u-turn
} else { } 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_PRIMARYGRIP", "+weapon_select", CVAR_ARCHIVE); // weapon selector
Cvar_Get ("vr_button_map_PRIMARYTHUMBSTICK", "", CVAR_ARCHIVE); // unmapped 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_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_RTHUMBLEFT_ALT", "turnleft", CVAR_ARCHIVE); // turn left
Cvar_Get ("vr_button_map_RTHUMBRIGHT_ALT", "turnright", CVAR_ARCHIVE); // turn right 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) { if (uturnEnabled) {
Cvar_Get ("vr_button_map_RTHUMBBACK_ALT", "uturn", CVAR_ARCHIVE); Cvar_Get ("vr_button_map_RTHUMBBACK_ALT", "uturn", CVAR_ARCHIVE);
} else { } 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_RTHUMBFORWARDRIGHT_ALT", "blank", CVAR_ARCHIVE); // unmapped
Cvar_Get ("vr_button_map_RTHUMBBACKRIGHT_ALT", "blank", CVAR_ARCHIVE); // unmapped Cvar_Get ("vr_button_map_RTHUMBBACKRIGHT_ALT", "blank", CVAR_ARCHIVE); // unmapped