-CVS: ----------------------------------------------------------------------

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index adeeedb318ef89aaf91f1a71a3ccb87cf7bb51ad..00401515687b547ee5cdcb9d50baf2942482e68a 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -641,7 +641,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                // if it's the player entity, update according to client movement
                if (e == cl_entities + cl.playerentity && cl.movement)
                {
-                       lerp = (cl.time - cl.mtime[0]) / (cl.mtime[0] - cl.mtime[1]);
+                       lerp = (cl.time - cl.mtime[1]) / (cl.mtime[0] - cl.mtime[1]);
                        lerp = bound(0, lerp, 1);
                        VectorLerp(cl.movement_oldorigin, lerp, cl.movement_origin, origin);
                        VectorSet(angles, 0, cl.viewangles[1], 0);
@@ -1244,6 +1244,7 @@ int CL_ReadFromServer(void)
        r_refdef.time = cl.time;
        r_refdef.extraupdate = !r_speeds.integer;
        r_refdef.numentities = 0;
+       Matrix4x4_CreateIdentity(&r_refdef.viewentitymatrix);
        cl_num_brushmodel_entities = 0;
 
        if (cls.state == ca_connected && cls.signon == SIGNONS)