Additional fix for FOV on Lady Luck turret

DrBeef · Apr 18, 2023 · 0acb046 · 0acb046
1 parent 0d39cb1
commit 0acb046
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp
@@ -143,7 +143,7 @@ void VR_SetHMDOrientation(float pitch, float yaw, float roll)
 	//Keep this for our records
 	VectorCopy(vr.hmdorientation, vr.hmdorientation_last);
 
-	if (!vr.third_person && !vr.remote_npc){
+	if (!vr.third_person && !vr.remote_npc && !vr.remote_turret){
 		VectorCopy(vr.hmdorientation, vr.hmdorientation_first);
 	}
 

diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
@@ -3012,6 +3012,12 @@ void CG_DrawActive( stereoFrame_t stereoView ) {
 		AnglesToAxis(cg.refdef.viewangles, cg.refdef.viewaxis);
 	}
 
+	//If viewing a remote turret, take the overridden FOV
+	if (vr->remote_turret)
+	{
+		cg.refdef.override_fov = true;
+	}
+
 	//Controlling an NPC that isn't a droid
 	if (vr->remote_npc &&
 		!vr->remote_droid)