more q3bsp work (and no it still doesn't work right)

[xonotic/darkplaces.git] / chase.c

diff --git a/chase.c b/chase.c
index 1b6e78ed2bb57337b5d653ed31938fcc49d33597..f03eb49fdcf8af0b0ed19bea2dec2cbf799fae58 100644 (file)
--- a/chase.c
+++ b/chase.c
@@ -20,16 +20,21 @@ 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 = {CVAR_SAVE, "chase_back", "48"};
-cvar_t chase_up = {CVAR_SAVE, "chase_up", "48"};
-cvar_t chase_active = {CVAR_SAVE, "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"};
+// GAME_GOODVSBAD2
+cvar_t chase_stevie = {0, "chase_stevie", "0"};
 
 void Chase_Init (void)
 {
        Cvar_RegisterVariable (&chase_back);
        Cvar_RegisterVariable (&chase_up);
        Cvar_RegisterVariable (&chase_active);
+       if (gamemode == GAME_GOODVSBAD2)
+               Cvar_RegisterVariable (&chase_stevie);
 }
 
 void Chase_Reset (void)
@@ -38,50 +43,32 @@ void Chase_Reset (void)
 //     start position 12 units behind head
 }
 
-int traceline_endcontents;
-
-float TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int contents)
-{
-       trace_t trace;
-
-// FIXME: broken, fix it
-//     if (impact == NULL && normal == NULL && contents == 0)
-//             return SV_TestLine (cl.worldmodel->hulls, 0, start, end);
-
-       Mod_CheckLoaded(cl.worldmodel);
-       memset (&trace, 0, sizeof(trace));
-       VectorCopy (end, trace.endpos);
-       trace.fraction = 1;
-       trace.startcontents = contents;
-       VectorCopy(start, RecursiveHullCheckInfo.start);
-       VectorSubtract(end, start, RecursiveHullCheckInfo.dist);
-       RecursiveHullCheckInfo.hull = cl.worldmodel->hulls;
-       RecursiveHullCheckInfo.trace = &trace;
-       SV_RecursiveHullCheck (0, 0, 1, start, end);
-       if (impact)
-               VectorCopy (trace.endpos, impact);
-       if (normal)
-               VectorCopy (trace.plane.normal, normal);
-       traceline_endcontents = trace.endcontents;
-       return trace.fraction;
-}
-
 void Chase_Update (void)
 {
-       vec3_t  forward, stop, chase_dest, normal;
-       float   dist;
-
-       chase_back.value = bound(0, chase_back.value, 128);
-       chase_up.value = bound(-48, chase_up.value, 96);
-
-       AngleVectors (cl.viewangles, forward, NULL, NULL);
+       vec_t camback, camup, dist, forward[3], stop[3], chase_dest[3], normal[3], projectangles[3];
+
+       camback = bound(0, chase_back.value, 128);
+       if (chase_back.value != camback)
+               Cvar_SetValueQuick(&chase_back, camback);
+       camup = bound(-48, chase_up.value, 96);
+       if (chase_up.value != camup)
+               Cvar_SetValueQuick(&chase_up, camup);
+
+       VectorCopy(cl.viewangles, projectangles);
+       if (gamemode == GAME_GOODVSBAD2 && chase_stevie.integer)
+       {
+               projectangles[0] = 90;
+               r_refdef.viewangles[0] = 90;
+               camback = 1024;
+       }
+       AngleVectors (projectangles, 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, normal, 0);
+       CL_TraceLine(r_refdef.vieworg, chase_dest, stop, normal, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY);
        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;