merged q1bsp and q3bsp surface rendering

[xonotic/darkplaces.git] / cl_input.c

diff --git a/cl_input.c b/cl_input.c
index 386552cef906b84a2862c01fa9d6796999a0d481..db36a23d997ee09b222a49a04421b8ec8c1f2c02 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -398,7 +398,7 @@ void CL_UpdatePrydonCursor(void)
        VectorCopy(r_vieworigin, cl.cmd.cursor_start);
        VectorSet(temp, cl.cmd.cursor_screen[2] * scale[2], cl.cmd.cursor_screen[0] * scale[0], cl.cmd.cursor_screen[1] * scale[1]);
        Matrix4x4_Transform(&r_view_matrix, temp, cl.cmd.cursor_end);
-       cl.cmd.cursor_fraction = CL_SelectTraceLine(cl.cmd.cursor_start, cl.cmd.cursor_end, cl.cmd.cursor_impact, cl.cmd.cursor_normal, &cl.cmd.cursor_entitynumber);
+       cl.cmd.cursor_fraction = CL_SelectTraceLine(cl.cmd.cursor_start, cl.cmd.cursor_end, cl.cmd.cursor_impact, cl.cmd.cursor_normal, &cl.cmd.cursor_entitynumber, (chase_active.integer || cl.intermission) ? &cl_entities[cl.playerentity].render : NULL);
        // makes sparks where cursor is
        //CL_SparkShower(cl.cmd.cursor_impact, cl.cmd.cursor_normal, 5, 0);
 }
@@ -568,6 +568,9 @@ void CL_SendMove(void)
        // deliver the message
        if (cls.demoplayback)
                return;
+       // nothing to send
+       if (!buf.cursize)
+               return;
 
        if (NetConn_SendUnreliableMessage(cls.netcon, &buf) == -1)
        {