Non-SDL version builds.

Tweaked VR viewpitch disable logic.
Zackin5 · Apr 26, 2017 · f10db38 · f10db38
1 parent 275d28f
commit f10db38
Show file tree

Hide file tree

Showing 3 changed files with 807 additions and 802 deletions.
diff --git a/Quake/view.c b/Quake/view.c
@@ -824,16 +824,10 @@ void V_CalcRefdef (void)
 	view->frame = cl.stats[STAT_WEAPONFRAME];
 	view->colormap = vid.colormap;
 
-//zackin5 -- disable viewkick in vr
-    bool vrDisableKick = false;
-
-    if (vr_enabled.value && !vr_viewkick.value)
-        vrDisableKick = true;
-
 //johnfitz -- v_gunkick
-	if (v_gunkick.value == 1 && !vrDisableKick) //original quake kick
+	if (v_gunkick.value == 1 && !(vr_enabled.value && !vr_viewkick.value)) //original quake kick
 		VectorAdd (r_refdef.viewangles, cl.punchangle, r_refdef.viewangles);
-	if (v_gunkick.value == 2 && !vrDisableKick) //lerped kick
+	if (v_gunkick.value == 2 && !(vr_enabled.value && !vr_viewkick.value)) //lerped kick
 	{
 		for (i=0; i<3; i++)
 			if (punch[i] != v_punchangles[0][i])