got rid of cl_glowinglightning cvar, lightning no longer glows

[xonotic/darkplaces.git] / cl_tent.c

diff --git a/cl_tent.c b/cl_tent.c
index d38ee2705302e708f7902778d315d78642c44c3b..42f342b011d25ecdf87f96d0dcf35b2130fd9313 100644 (file)
--- a/cl_tent.c
+++ b/cl_tent.c
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-cvar_t cl_glowinglightning = {CVAR_SAVE, "cl_glowinglightning", "1"};
-
 int                    num_temp_entities;
 entity_t       cl_temp_entities[MAX_TEMP_ENTITIES];
 beam_t         cl_beams[MAX_BEAMS];
@@ -47,7 +45,6 @@ CL_ParseTEnt
 */
 void CL_InitTEnts (void)
 {
-       Cvar_RegisterVariable(&cl_glowinglightning);
        cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav");
        cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav");
        cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav");
@@ -285,7 +282,8 @@ void CL_ParseTEnt (void)
                Mod_FindNonSolidLocation(pos, cl.worldmodel);
                CL_ParticleExplosion (pos, false);
 //             CL_BlastParticles (pos, 120, 120);
-               CL_AllocDlight (NULL, pos, 350, 1.0f, 0.8f, 0.4f, 700, 0.5);
+               // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
+               CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5);
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
                break;
 
@@ -366,26 +364,26 @@ void CL_ParseTEnt (void)
 
        case TE_LIGHTNING1:                             // lightning bolts
                if (!cl_model_bolt)
-                       cl_model_bolt = Mod_ForName("progs/bolt.mdl", true, true, false);
+                       cl_model_bolt = Mod_ForName("progs/bolt.mdl", true, false, false);
                CL_ParseBeam (cl_model_bolt);
                break;
 
        case TE_LIGHTNING2:                             // lightning bolts
                if (!cl_model_bolt2)
-                       cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", true, true, false);
+                       cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", true, false, false);
                CL_ParseBeam (cl_model_bolt2);
                break;
 
        case TE_LIGHTNING3:                             // lightning bolts
                if (!cl_model_bolt3)
-                       cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, true, false);
+                       cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, false, false);
                CL_ParseBeam (cl_model_bolt3);
                break;
 
 // PGM 01/21/97
        case TE_BEAM:                           // grappling hook beam
                if (!cl_model_beam)
-                       cl_model_beam = Mod_ForName("progs/beam.mdl", true, true, false);
+                       cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false);
                CL_ParseBeam (cl_model_beam);
                break;
 // PGM 01/21/97
@@ -436,13 +434,13 @@ entity_t *CL_NewTempEntity (void)
 {
        entity_t        *ent;
 
-       if (cl_numvisedicts >= MAX_VISEDICTS)
+       if (r_refdef.numentities >= MAX_VISEDICTS)
                return NULL;
        if (num_temp_entities >= MAX_TEMP_ENTITIES)
                return NULL;
        ent = &cl_temp_entities[num_temp_entities++];
        memset (ent, 0, sizeof(*ent));
-       cl_visedicts[cl_numvisedicts++] = ent;
+       r_refdef.entities[r_refdef.numentities++] = &ent->render;
 
        ent->render.colormap = -1; // no special coloring
        ent->render.scale = 1;
@@ -515,10 +513,6 @@ void CL_UpdateTEnts (void)
                        ent->render.angles[0] = pitch;
                        ent->render.angles[1] = yaw;
                        ent->render.angles[2] = rand()%360;
-
-                       if (cl_glowinglightning.value > 0)
-                               CL_AllocDlight(&ent->render, ent->render.origin, lhrandom(200, 240), cl_glowinglightning.value * 0.25f, cl_glowinglightning.value * 0.25f, cl_glowinglightning.value * 0.25f, 0, 0);
-
                        VectorMA(org, 30, dist, org);
                        d -= 30;
                }