From 4454ba1b75a7c0d93eaedba9d5d2d2221742668f Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 8 May 2010 22:05:04 +0200
Subject: [PATCH] cleaner handling of view origin and angles for input in
 warpzonelib

---
 qcsrc/client/View.qc        | 12 +++++++-----
 qcsrc/warpzonelib/client.qc | 28 +++++++++++++++++++++-------
 qcsrc/warpzonelib/client.qh |  1 +
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index afa884df1..2c898bbcb 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -363,17 +363,19 @@ void CSQC_UpdateView(float w, float h)
 	vo = '0 0 1' * getstati(STAT_VIEWHEIGHT);
 
 	warpzone_fixview_origin = pmove_org + vo;
-	warpzone_fixview_angles = input_angles;
+	warpzone_fixview_cl_viewangles = input_angles;
+	warpzone_fixview_angles = view_angles;
 	WarpZone_FixView();
 	pmove_org = warpzone_fixview_origin - vo;
-	input_angles = warpzone_fixview_angles;
+	input_angles = warpzone_fixview_cl_viewangles;
+	view_angles = warpzone_fixview_angles;
 
 	if(cvar("cl_lockview"))
 	{
-		pmove_org = warpzone_fixview_origin = freeze_pmove_org;
-		input_angles = freeze_input_angles;
+		pmove_org = freeze_pmove_org;
+		input_angles = view_angles = freeze_input_angles;
 		R_SetView(VF_ORIGIN, pmove_org + vo);
-		R_SetView(VF_ANGLES, input_angles);
+		R_SetView(VF_ANGLES, view_angles);
 		//R_SetView(VF_CL_VIEWANGLES, input_angles);
 	}
 	freeze_pmove_org = pmove_org;
diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index c16fc898b..773e90d5e 100644
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -112,22 +112,33 @@ void WarpZone_Outside()
 float warpzone_saved;
 vector warpzone_saved_origin;
 vector warpzone_saved_angles;
+vector warpzone_saved_cl_viewangles;
 #ifndef KEEP_ROLL
 var float autocvar_cl_rollkillspeed = 10;
 #endif
 void WarpZone_FixView()
 {
-	float pd;
+	float pd, f;
 	entity e;
 	warpzone_saved = 0;
 	warpzone_saved_origin = warpzone_fixview_origin;
 	warpzone_saved_angles = warpzone_fixview_angles;
+	warpzone_saved_cl_viewangles = warpzone_fixview_cl_viewangles;
 
 #ifndef KEEP_ROLL
-	if(autocvar_cl_rollkillspeed)
-		R_SetView(VF_CL_VIEWANGLES_Z, input_angles_z * max(0, (1 - frametime * autocvar_cl_rollkillspeed)));
-	else
-		R_SetView(VF_CL_VIEWANGLES_Z, 0);
+	if(warpzone_fixview_angles_z != 0 || warpzone_fixview_cl_viewangles_z != 0)
+	{
+		if(autocvar_cl_rollkillspeed)
+			f = max(0, (1 - frametime * autocvar_cl_rollkillspeed));
+		else
+			f = 0;
+		warpzone_fixview_angles_z *= f;
+		warpzone_fixview_cl_viewangles_z *= f;
+		warpzone_saved_angles_z *= f; // PERMANENTLY apply that change!
+		warpzone_saved_cl_viewangles_z *= f; // PERMANENTLY apply that change!
+		warpzone_saved = 2;
+		R_SetView(VF_CL_VIEWANGLES_Z, warpzone_fixview_angles_z);
+	}
 #endif
 
 	e = WarpZone_Find(warpzone_fixview_origin, warpzone_fixview_origin);
@@ -136,6 +147,7 @@ void WarpZone_FixView()
 		warpzone_saved = 1;
 		warpzone_fixview_origin = WarpZone_TransformOrigin(e, warpzone_fixview_origin);
 		warpzone_fixview_angles = WarpZone_TransformVAngles(e, warpzone_fixview_angles);
+		warpzone_fixview_cl_viewangles = WarpZone_TransformVAngles(e, warpzone_fixview_cl_viewangles);
 		WarpZone_Inside();
 	}
 	else
@@ -154,10 +166,10 @@ void WarpZone_FixView()
 		}
 	}
 
-	if(warpzone_saved)
+	if(warpzone_saved == 1)
 	{
 		R_SetView(VF_ORIGIN, warpzone_fixview_origin);
-		R_SetView(VF_ANGLES, warpzone_fixview_angles);
+		R_SetView(VF_ANGLES, warpzone_fixview_cl_viewangles);
 	}
 }
 void WarpZone_UnFixView()
@@ -166,8 +178,10 @@ void WarpZone_UnFixView()
 	{
 		warpzone_fixview_origin = warpzone_saved_origin;
 		warpzone_fixview_angles = warpzone_saved_angles;
+		warpzone_fixview_cl_viewangles = warpzone_saved_cl_viewangles;
 		R_SetView(VF_ORIGIN, warpzone_fixview_origin);
 		R_SetView(VF_ANGLES, warpzone_fixview_angles);
+		R_SetView(VF_CL_VIEWANGLES, warpzone_fixview_cl_viewangles);
 	}
 }
 
diff --git a/qcsrc/warpzonelib/client.qh b/qcsrc/warpzonelib/client.qh
index 5ab212a33..e8f44be13 100644
--- a/qcsrc/warpzonelib/client.qh
+++ b/qcsrc/warpzonelib/client.qh
@@ -3,6 +3,7 @@ void WarpZone_Camera_Read(float bIsNewEntity);
 
 vector warpzone_fixview_origin;
 vector warpzone_fixview_angles;
+vector warpzone_fixview_cl_viewangles;
 void WarpZone_FixView(); // this saves the previous values
 void WarpZone_UnFixView(); // and restores them
 
-- 
2.39.2