beginnings of some proper server list code, commented out for now

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 59babb2cb46263a0933b613521f5eb2fdf092ba0..ad2f92c9d5fd362d577f2bb55c4a35bb82c853f6 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -473,7 +473,7 @@ static void CL_RelinkStaticEntities(void)
 CL_RelinkEntities
 ===============
 */
-static void CL_RelinkNetworkEntities()
+static void CL_RelinkNetworkEntities(void)
 {
        entity_t *ent;
        int i, effects, temp;
@@ -541,7 +541,7 @@ static void CL_RelinkNetworkEntities()
 
                VectorCopy (neworg, ent->persistent.trail_origin);
                // persistent.modelindex will be updated by CL_LerpUpdate
-               if (ent->state_current.modelindex != ent->persistent.modelindex)
+               if (ent->state_current.modelindex != ent->persistent.modelindex || !ent->state_previous.active)
                        VectorCopy(neworg, oldorg);
 
                VectorCopy (neworg, ent->render.origin);
@@ -571,7 +571,19 @@ static void CL_RelinkNetworkEntities()
                if (effects)
                {
                        if (effects & EF_BRIGHTFIELD)
-                               CL_EntityParticles (ent);
+                       {
+                               if (gamemode == GAME_NEXIUZ)
+                               {
+                                       dlightcolor[0] += 100.0f;
+                                       dlightcolor[1] += 200.0f;
+                                       dlightcolor[2] += 400.0f;
+                                       // don't do trail if we have no previous location
+                                       if (ent->state_previous.active)
+                                               CL_RocketTrail (oldorg, neworg, 8, ent);
+                               }
+                               else
+                                       CL_EntityParticles (ent);
+                       }
                        if (effects & EF_MUZZLEFLASH)
                                ent->persistent.muzzleflash = 100.0f;
                        if (effects & EF_DIMLIGHT)
@@ -771,7 +783,7 @@ void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float
        }
 }
 
-static void CL_RelinkEffects()
+static void CL_RelinkEffects(void)
 {
        int i, intframe;
        cl_effect_t *e;