CL_TraceLine can now return what entity was hit (this isn't actually used, and accoun...

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index d64715fa5378b492b7e5c67372b59bb7a054688b..bf38fce51724559602cca8931f37749a597de255 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -644,7 +644,7 @@ static void CL_RelinkNetworkEntities()
                        v2[0] = v[0] * 18 + neworg[0];
                        v2[1] = v[1] * 18 + neworg[1];
                        v2[2] = v[2] * 18 + neworg[2] + 16;
-                       CL_TraceLine(neworg, v2, v, NULL, 0, true);
+                       CL_TraceLine(neworg, v2, v, NULL, 0, true, NULL);
 
                        CL_AllocDlight (NULL, v, ent->persistent.muzzleflash, 1, 1, 1, 0, 0);
                        ent->persistent.muzzleflash -= cl.frametime * 1000;
@@ -849,7 +849,7 @@ void CL_RelinkBeams (void)
                // if coming from the player, update the start position
                //if (b->entity == cl.viewentity)
                //      VectorCopy (cl_entities[cl.viewentity].render.origin, b->start);
-               if (b->entity)
+               if (b->entity && cl_entities[b->entity].state_current.active)
                {
                        VectorCopy (cl_entities[b->entity].render.origin, b->start);
                        b->start[2] += 16;