]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
make event chase cam warpzone aware (PLEASE TEST)
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 19:05:32 +0000 (21:05 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 19:05:32 +0000 (21:05 +0200)
qcsrc/client/View.qc

index 89881299041124fab9680e58804c3ed2fc0eb007..6c6ab2aaa9457a34bc3ad17129ba2c435e5303af 100644 (file)
@@ -447,13 +447,14 @@ void CSQC_UpdateView(float w, float h)
                        // pass 1, used to check where the camera would go and obtain the trace_fraction
                        eventchase_target_origin = pmove_org - v_forward * eventchase_current_distance;
 
-                       traceline(pmove_org, eventchase_target_origin, MOVE_WORLDONLY, self);
+                       WarpZone_TraceLine(pmove_org, eventchase_target_origin, MOVE_WORLDONLY, self);
                        // pass 2, also multiplying view_forward with trace_fraction, to prevent the camera from going through walls
                        // The 0.1 subtraction is to not limit the camera precisely at the wall surface, as that allows the view to poke through
                        eventchase_target_origin = pmove_org - v_forward * eventchase_current_distance * (trace_fraction - 0.1);
+                       WarpZone_TraceLine(pmove_org, eventchase_target_origin, MOVE_WORLDONLY, self);
 
-                       R_SetView(VF_ORIGIN, eventchase_target_origin);
-                       R_SetView(VF_ANGLES, view_angles);
+                       R_SetView(VF_ORIGIN, trace_endpos);
+                       R_SetView(VF_ANGLES, WarpZone_TransformVAngles(WarpZone_trace_transform, view_angles));
                }
                else if(autocvar_chase_active < 0) // time to disable chase_active if it was set by this code
                {