Merge pull request #49 from petr666/feature/various-fixes

Various fixes
This commit is contained in:
Simon 2022-04-05 22:12:01 +01:00 committed by GitHub
commit 0fcd0a361a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -672,7 +672,7 @@ static int CG_CalcViewValues( ) {
// intermission view // intermission view
static float hmdYaw = 0; 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 ); VectorCopy( ps->origin, cg.refdef.vieworg );
static vec3_t mins = { -1, -1, -1 }; static vec3_t mins = { -1, -1, -1 };

View file

@ -466,6 +466,7 @@ static void IN_VRController( qboolean isRightController, ovrTracking remoteTrack
if (vr.virtual_screen || cl.snap.ps.pm_type == PM_INTERMISSION) if (vr.virtual_screen || cl.snap.ps.pm_type == PM_INTERMISSION)
{ {
vr.weapon_zoomed = qfalse;
if (vr.menuCursorX && vr.menuCursorY) if (vr.menuCursorX && vr.menuCursorY)
{ {
float yaw; float yaw;