teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 14:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #71 from petr666/feature/control-tweaks

Browse source 
Hardcode A to skip server search in menu instead of using moveup bind hack
This commit is contained in:
Simon 2022-05-01 10:20:16 +01:00 committed by GitHub
commit df4bc0c072
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
android/app/src/main/cpp/code/vr/vr_input.c
View file

@ -306,12 +306,6 @@ static qboolean IN_SendInputAction(const char* action, qboolean inputActive, flo
vr.weapon_stabilised = qfalse; vr.weapon_stabilised = qfalse;
} }
} }
//Special case for moveup as we can send a space key instead allowing us to skip
//server search in the server menu
else if (strcmp(action, "+moveup") == 0)
{
Com_QueueEvent(in_vrEventTime, SE_KEY, K_SPACE, inputActive, 0, NULL);
}
else if (strcmp(action, "+weapon_select") == 0) else if (strcmp(action, "+weapon_select") == 0)
{ {
vr.weapon_select = inputActive; vr.weapon_select = inputActive;
@ -899,13 +893,32 @@ static void IN_VRButtons( qboolean isRightController, uint32_t buttons )
Cbuf_AddText("cmd team spectator\n"); Cbuf_AddText("cmd team spectator\n");
} }
} }
else if (VR_useScreenLayer() || cl.snap.ps.pm_type == PM_INTERMISSION)
{
// Skip server search in the server menu
if (!IN_InputActivated(&controller->buttons, ovrButton_A)) {
IN_ActivateInput(&controller->buttons, ovrButton_A);
Com_QueueEvent(in_vrEventTime, SE_KEY, K_SPACE, qtrue, 0, NULL);
}
}
else else
{ {
IN_HandleActiveInput(&controller->buttons, ovrButton_A, "A", 0, qfalse); IN_HandleActiveInput(&controller->buttons, ovrButton_A, "A", 0, qfalse);
} }
} else { } else {
if (VR_useScreenLayer() || cl.snap.ps.pm_type == PM_INTERMISSION)
{
// Skip server search in the server menu
if (IN_InputActivated(&controller->buttons, ovrButton_A)) {
IN_DeactivateInput(&controller->buttons, ovrButton_A);
Com_QueueEvent(in_vrEventTime, SE_KEY, K_SPACE, qfalse, 0, NULL);
}
}
else
{
IN_HandleInactiveInput(&controller->buttons, ovrButton_A, "A", 0, qfalse); IN_HandleInactiveInput(&controller->buttons, ovrButton_A, "A", 0, qfalse);
} }
}
if (buttons & ovrButton_B) { if (buttons & ovrButton_B) {
IN_HandleActiveInput(&controller->buttons, ovrButton_B, "B", 0, qfalse); IN_HandleActiveInput(&controller->buttons, ovrButton_B, "B", 0, qfalse);