From: Samual Lenks <samual@xonotic.org>
Date: Tue, 5 Feb 2013 16:28:24 +0000 (-0500)
Subject: Stop manually adjusting the chase_* offset cvars, check origin normally
X-Git-Tag: xonotic-v0.7.0~102^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d977f0dbd5619fd88719ca32a09223d836e3120;p=xonotic%2Fxonotic-data.pk3dir.git

Stop manually adjusting the chase_* offset cvars, check origin normally
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 1548f0d8d..fc98ea6d9 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -368,11 +368,7 @@ vector myhealth_gentlergb;
 float contentavgalpha, liquidalpha_prev;
 vector liquidcolor_prev;
 
-#define EVENTCHASE_UNSAVED -12345
 float eventchase_current_distance;
-var float eventchase_back_save = EVENTCHASE_UNSAVED;
-var float eventchase_overhead_save = EVENTCHASE_UNSAVED;
-var float eventchase_up_save = EVENTCHASE_UNSAVED;
 
 vector damage_blurpostprocess, content_blurpostprocess;
 
@@ -454,21 +450,12 @@ void CSQC_UpdateView(float w, float h)
 		if(spectatee_status >= 0 && (autocvar_cl_eventchase_death && getstati(STAT_HEALTH) <= 0 && !intermission) || intermission)
 		{
 			// make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.)
-			vector current_view_origin = (pmove_org + autocvar_sv_spectator_viewoffset);
+			vector current_view_origin = ((csqcplayer ? csqcplayer.origin : pmove_org) + autocvar_sv_spectator_viewoffset);
 
 			// We must enable chase_active to get a third person view (weapon viewmodel hidden and own player model showing).
 			// Ideally, there should be another way to enable third person cameras, such as through setproperty()
-			if(!autocvar_chase_active)
-			{
-				cvar_set("chase_active", "-1"); // -1 enables chase_active while marking it as set by this code, and not by the user (which would be 1)
-
-				if(eventchase_back_save == EVENTCHASE_UNSAVED) 		{ eventchase_back_save = cvar("chase_back"); }
-				if(eventchase_overhead_save == EVENTCHASE_UNSAVED) 	{ eventchase_overhead_save = cvar("chase_overhead"); }
-				if(eventchase_up_save == EVENTCHASE_UNSAVED) 		{ eventchase_up_save = cvar("chase_up"); }
-				//cvar_set("chase_back", "0"); // don't let chase adjust the camera
-				//cvar_set("chase_overhead", "0"); // no overhead view either
-				//cvar_set("chase_up", "0"); // don't let chase adjust the camera
-			}
+			// -1 enables chase_active while marking it as set by this code, and not by the user (which would be 1)
+			if(!autocvar_chase_active) { cvar_set("chase_active", "-1"); }
 
 			// make the camera smooth back
 			if(autocvar_cl_eventchase_speed && eventchase_current_distance < autocvar_cl_eventchase_distance)
@@ -487,13 +474,7 @@ void CSQC_UpdateView(float w, float h)
 		else if(autocvar_chase_active < 0) // time to disable chase_active if it was set by this code
 		{
 			cvar_set("chase_active", "0");
-			//cvar_set("chase_back", ftos(eventchase_back_save));
-			//cvar_set("chase_overhead", ftos(eventchase_overhead_save));
-			//cvar_set("chase_up", ftos(eventchase_up_save));
 			eventchase_current_distance = 0; // start from 0 next time
-			eventchase_back_save = EVENTCHASE_UNSAVED;
-			eventchase_overhead_save = EVENTCHASE_UNSAVED;
-			eventchase_up_save = EVENTCHASE_UNSAVED;
 		}
 	}
 	// workaround for camera stuck between player's legs when using chase_active 1