X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=chase.c;h=be915bcf84057d905944fbc8f5a6ae8069338d70;hb=89c97e5914f82a665bfc57d521af35b12b4ad091;hp=1831a98caca4df5f0c1594a4bfa7e531375e9f3e;hpb=1b601105a1d4228358fa0245329cdcb5768c49df;p=xonotic%2Fdarkplaces.git

diff --git a/chase.c b/chase.c
index 1831a98c..be915bcf 100644
--- a/chase.c
+++ b/chase.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -20,10 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // chase.c -- chase camera code
 
 #include "quakedef.h"
+#include "cl_collision.h"
 
-cvar_t	chase_back = {"chase_back", "48"};
-cvar_t	chase_up = {"chase_up", "22"};
-cvar_t	chase_active = {"chase_active", "0"};
+cvar_t chase_back = {CVAR_SAVE, "chase_back", "48"};
+cvar_t chase_up = {CVAR_SAVE, "chase_up", "24"};
+cvar_t chase_active = {CVAR_SAVE, "chase_active", "0"};
 
 void Chase_Init (void)
 {
@@ -38,44 +39,25 @@ void Chase_Reset (void)
 //	start position 12 units behind head
 }
 
-qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace);
-
-void TraceLine (vec3_t start, vec3_t end, vec3_t impact)
-{
-	trace_t	trace;
-
-	memset (&trace, 0, sizeof(trace));
-	SV_RecursiveHullCheck (cl.worldmodel->hulls, 0, 0, 1, start, end, &trace);
-
-	if (trace.fraction < 1)
-	{
-		VectorCopy (trace.endpos, impact);
-	}
-	else
-	{
-		VectorCopy (end, impact);
-	}
-}
-
 void Chase_Update (void)
 {
-	vec3_t	forward, up, right, stop, chase_dest;
+	vec3_t	forward, stop, chase_dest, normal;
 	float	dist;
 
 	chase_back.value = bound(0, chase_back.value, 128);
-	chase_up.value = bound(-64, chase_up.value, 64);
+	chase_up.value = bound(-48, chase_up.value, 96);
 
-	AngleVectors (cl.viewangles, forward, right, up);
+	AngleVectors (cl.viewangles, forward, NULL, NULL);
 
 	dist = -chase_back.value - 8;
 	chase_dest[0] = r_refdef.vieworg[0] + forward[0] * dist;
 	chase_dest[1] = r_refdef.vieworg[1] + forward[1] * dist;
 	chase_dest[2] = r_refdef.vieworg[2] + forward[2] * dist + chase_up.value;
 
-	TraceLine (r_refdef.vieworg, chase_dest, stop);
-	chase_dest[0] = stop[0] + forward[0] * 8;
-	chase_dest[1] = stop[1] + forward[1] * 8;
-	chase_dest[2] = stop[2] + forward[2] * 8;
+	CL_TraceLine (r_refdef.vieworg, chase_dest, stop, normal, 0, true, NULL);
+	chase_dest[0] = stop[0] + forward[0] * 8 + normal[0] * 4;
+	chase_dest[1] = stop[1] + forward[1] * 8 + normal[1] * 4;
+	chase_dest[2] = stop[2] + forward[2] * 8 + normal[2] * 4;
 
 	VectorCopy (chase_dest, r_refdef.vieworg);
 }