X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=view.c;h=16dbcf740a2f1dc70726b1e47e671589fc8e8edd;hb=2048a824c4d5c5d4d031e519dd3a125db35415fd;hp=559ab97ee819ad952f2cb05c2245e3ccc502b814;hpb=ff444a84a42f11cf4e046c7adcb80eb2150e6254;p=xonotic%2Fdarkplaces.git

diff --git a/view.c b/view.c
index 559ab97e..16dbcf74 100644
--- a/view.c
+++ b/view.c
@@ -446,6 +446,7 @@ static void highpass3_limited(vec3_t value, vec_t fracx, vec_t limitx, vec_t fra
  *   cl.oldongrounbd
  *   cl.stairsmoothtime
  *   cl.stairsmoothz
+ *   cl.calcrefdef_prevtime
  * Extra input:
  *   cl.movecmd[0].time
  *   cl.movevars_stepheight
@@ -490,6 +491,7 @@ void V_CalcRefdefUsing (const matrix4x4_t *entrendermatrix, const vec3_t clviewa
 		cl.lastongroundtime = cl.movecmd[0].time;
 	}
 	cl.oldonground = clonground;
+	cl.calcrefdef_prevtime = max(cl.calcrefdef_prevtime, cl.oldtime);
 
 	VectorClear(gunorg);
 	viewmodelmatrix_nobob = identitymatrix;
@@ -548,7 +550,7 @@ void V_CalcRefdefUsing (const matrix4x4_t *entrendermatrix, const vec3_t clviewa
 
 		// apply the viewofs (even if chasecam is used)
 		// Samual: Lets add smoothing for this too so that things like crouching are done with a transition.
-		viewheight = bound(0, (cl.time - cl.oldtime) / max(0.0001, cl_smoothviewheight.value), 1);
+		viewheight = bound(0, (cl.time - cl.calcrefdef_prevtime) / max(0.0001, cl_smoothviewheight.value), 1);
 		viewheightavg = viewheightavg * (1 - viewheight) + clstatsviewheight * viewheight;
 		vieworg[2] += viewheightavg;
 
@@ -657,7 +659,7 @@ void V_CalcRefdefUsing (const matrix4x4_t *entrendermatrix, const vec3_t clviewa
 				float cycle;
 				vec_t frametime;
 
-				frametime = (cl.time - cl.oldtime) * cl.movevars_timescale;
+				frametime = (cl.time - cl.calcrefdef_prevtime) * cl.movevars_timescale;
 
 				// 1. if we teleported, clear the frametime... the lowpass will recover the previous value then
 				if(teleported)
@@ -864,6 +866,8 @@ void V_CalcRefdefUsing (const matrix4x4_t *entrendermatrix, const vec3_t clviewa
 		Matrix4x4_Invert_Simple(&tmpmatrix, &r_refdef.view.matrix);
 		Matrix4x4_Concat(&cl.csqc_viewmodelmatrixfromengine, &tmpmatrix, &viewmodelmatrix_withbob);
 	}
+
+	cl.calcrefdef_prevtime = cl.time;
 }
 
 void V_CalcRefdef (void)
@@ -877,7 +881,7 @@ void V_CalcRefdef (void)
 		ent = &cl.entities[cl.viewentity];
 
 		cldead = (cl.stats[STAT_HEALTH] <= 0 && cl.stats[STAT_HEALTH] != -666 && cl.stats[STAT_HEALTH] != -2342);
-		V_CalcRefdefUsing(&ent->render.matrix, cl.viewangles, !ent->persistent.trail_allowed, cl.onground, cl.cmd.jump, cl.stats[STAT_VIEWHEIGHT], cldead, cl.intermission, cl.velocity); // FIXME use a better way to detect teleport/warp than trail_allowed
+		V_CalcRefdefUsing(&ent->render.matrix, cl.viewangles, !ent->persistent.trail_allowed, cl.onground, cl.cmd.jump, cl.stats[STAT_VIEWHEIGHT], cldead, cl.intermission != 0, cl.velocity); // FIXME use a better way to detect teleport/warp than trail_allowed
 	}
 	else
 	{