Merged CL_RocketTrail2 into CL_RocketTrail.

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 7fcdf257732a8ef007e91b82f93c49bdf6fe2d3c..86a7e89565637dd7dfc2af8cbae88c49d8906c4b 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -46,7 +46,6 @@ cvar_t freelook = {CVAR_SAVE, "freelook", "1"};
 
 cvar_t r_draweffects = {0, "r_draweffects", "1"};
 
-cvar_t cl_explosions = {CVAR_SAVE, "cl_explosions", "1"};
 cvar_t cl_explosions_alpha_start = {CVAR_SAVE, "cl_explosions_alpha_start", "1.5"};
 cvar_t cl_explosions_alpha_end = {CVAR_SAVE, "cl_explosions_alpha_end", "0"};
 cvar_t cl_explosions_size_start = {CVAR_SAVE, "cl_explosions_size_start", "16"};
@@ -536,6 +535,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                        // make relative to the entity
                        matrix = &t->render.matrix;
                        // if a valid tagindex is used, make it relative to that tag instead
+                       // FIXME: use a model function to get tag info (need to handle skeletal)
                        if (e->state_current.tagentity && e->state_current.tagindex >= 1 && (model = t->render.model) && e->state_current.tagindex <= t->render.model->alias.aliasnum_tags)
                        {
                                // blend the matrices
@@ -837,9 +837,9 @@ void CL_LinkNetworkEntity(entity_t *e)
                if (e->state_previous.active && e->state_previous.modelindex == e->state_current.modelindex)
                {
                        if (e->render.flags & RENDER_GLOWTRAIL)
-                               CL_RocketTrail2(e->persistent.trail_origin, origin, e->state_current.glowcolor, e);
-                       else if (trailtype >= 0)
-                               CL_RocketTrail(e->persistent.trail_origin, origin, trailtype, e);
+                               trailtype = 9;
+                       if (trailtype >= 0)
+                               CL_RocketTrail(e->persistent.trail_origin, origin, trailtype, e->state_current.glowcolor, e);
                }
                VectorCopy(origin, e->persistent.trail_origin);
                // note: the cl.viewentity and intermission check is to hide player
@@ -1008,7 +1008,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 (cl_beams_relative.integer && b->entity && cl_entities[b->entity].state_current.active && b->relativestartvalid)
+               if (cl_beams_relative.integer && b->entity == cl.viewentity && b->entity && cl_entities[b->entity].state_current.active && b->relativestartvalid)
                {
                        entity_state_t *p = &cl_entities[b->entity].state_previous;
                        //entity_state_t *c = &cl_entities[b->entity].state_current;
@@ -1319,7 +1319,6 @@ void CL_Init (void)
        Cmd_AddCommand ("pausedemo", CL_PauseDemo_f);
 
        Cvar_RegisterVariable(&r_draweffects);
-       Cvar_RegisterVariable(&cl_explosions);
        Cvar_RegisterVariable(&cl_explosions_alpha_start);
        Cvar_RegisterVariable(&cl_explosions_alpha_end);
        Cvar_RegisterVariable(&cl_explosions_size_start);