From: Mario <mario@smbclan.net>
Date: Wed, 28 Aug 2019 10:25:56 +0000 (+1000)
Subject: Don't apply the modifications to camera during intermission
X-Git-Tag: xonotic-v0.8.5~1105^2~59^2~6
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=b411d9803e8e4cf16e52699a053515f8a809c017;p=xonotic%2Fxonotic-data.pk3dir.git

Don't apply the modifications to camera during intermission
---

diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc
index 09bed99da..095b41ab7 100644
--- a/qcsrc/lib/csqcmodel/cl_player.qc
+++ b/qcsrc/lib/csqcmodel/cl_player.qc
@@ -565,21 +565,29 @@ void CSQCPlayer_SetCamera()
 		else
 		{
 			vector vieworg = view.origin;
-			vieworg = CSQCPlayer_ApplySmoothing(view, vieworg);
-			if(autocvar_chase_active)
-				vieworg = CSQCPlayer_ApplyChase(view, vieworg);
+			if(intermission)
+			{
+				// just update view offset, don't need to do anything else
+				vieworg.z += view.view_ofs.z;
+			}
 			else
 			{
-				// angles
-				CSQCPlayer_ApplyDeathTilt(view);
-				view_angles = view_angles + view_punchangle;
-				view_angles.z += CSQCPlayer_CalcRoll(view);
-				// TODO? we don't have damage time accessible here
-				// origin
-				vieworg = vieworg + view_punchvector;
-				vieworg = CSQCPlayer_ApplyBobbing(view, vieworg);
+				vieworg = CSQCPlayer_ApplySmoothing(view, vieworg);
+				if(autocvar_chase_active)
+					vieworg = CSQCPlayer_ApplyChase(view, vieworg);
+				else
+				{
+					// angles
+					CSQCPlayer_ApplyDeathTilt(view);
+					view_angles = view_angles + view_punchangle;
+					view_angles.z += CSQCPlayer_CalcRoll(view);
+					// TODO? we don't have damage time accessible here
+					// origin
+					vieworg = vieworg + view_punchvector;
+					vieworg = CSQCPlayer_ApplyBobbing(view, vieworg);
+				}
+				CSQCPlayer_ApplyIdleScaling(view);
 			}
-			CSQCPlayer_ApplyIdleScaling(view);
 			setproperty(VF_ORIGIN, vieworg);
 			setproperty(VF_ANGLES, view_angles);
 		}