From dc7c01667d1063d4e96fbc95743578778c9b0da4 Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Tue, 5 Apr 2022 20:19:13 +0200 Subject: [PATCH 1/2] Do not move during spectating by turning controller/hmd --- android/app/src/main/cpp/code/cgame/cg_view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/cpp/code/cgame/cg_view.c b/android/app/src/main/cpp/code/cgame/cg_view.c index e7dbfbe0..fec21ed0 100644 --- a/android/app/src/main/cpp/code/cgame/cg_view.c +++ b/android/app/src/main/cpp/code/cgame/cg_view.c @@ -672,7 +672,7 @@ static int CG_CalcViewValues( ) { // intermission view static float hmdYaw = 0; - if ( ps->pm_type == PM_INTERMISSION ) { + if ( (ps->pm_type == PM_INTERMISSION || ps->pm_type == PM_SPECTATOR) && !vr->virtual_screen ) { VectorCopy( ps->origin, cg.refdef.vieworg ); static vec3_t mins = { -1, -1, -1 }; From 9a88b190a97a18cfcf8f1becd0cf279e02ca27af Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Tue, 5 Apr 2022 20:27:35 +0200 Subject: [PATCH 2/2] Do not end locked up in weapon zoomed state on level end and in pause menu --- android/app/src/main/cpp/code/vr/vr_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/src/main/cpp/code/vr/vr_input.c b/android/app/src/main/cpp/code/vr/vr_input.c index 5c342827..31213a7f 100644 --- a/android/app/src/main/cpp/code/vr/vr_input.c +++ b/android/app/src/main/cpp/code/vr/vr_input.c @@ -466,6 +466,7 @@ static void IN_VRController( qboolean isRightController, ovrTracking remoteTrack if (vr.virtual_screen || cl.snap.ps.pm_type == PM_INTERMISSION) { + vr.weapon_zoomed = qfalse; if (vr.menuCursorX && vr.menuCursorY) { float yaw;