win32 fixes and some MSVC warnings fixed

[xonotic/darkplaces.git] / cl_light.c

diff --git a/cl_light.c b/cl_light.c
index e4b9d4bb0108019fdbc45cbcce5e02efcb8d5bd6..9ab6ea3290da393b7b09cc725f6d41254ae5610e 100644 (file)
--- a/cl_light.c
+++ b/cl_light.c
@@ -1,25 +1,8 @@
+
 #include "quakedef.h"
 
 dlight_t cl_dlights[MAX_DLIGHTS];
 
-void cl_light_start(void)
-{
-}
-
-void cl_light_shutdown(void)
-{
-}
-
-void cl_light_newmap(void)
-{
-       memset (cl_dlights, 0, sizeof(cl_dlights));
-}
-
-void CL_Light_Init(void)
-{
-       R_RegisterModule("CL_Light", cl_light_start, cl_light_shutdown, cl_light_newmap);
-}
-
 /*
 ===============
 CL_AllocDlight
@@ -58,7 +41,10 @@ dlightsetup:
        dl->color[1] = green;
        dl->color[2] = blue;
        dl->decay = decay;
-       dl->die = cl.time + lifetime;
+       if (lifetime)
+               dl->die = cl.time + lifetime;
+       else
+               dl->die = 0;
 }
 
 
@@ -76,7 +62,6 @@ void CL_DecayLights (void)
 
        time = cl.time - cl.oldtime;
 
-       c_dlights = 0;
        dl = cl_dlights;
        for (i=0 ; i<MAX_DLIGHTS ; i++, dl++)
        {
@@ -88,12 +73,9 @@ void CL_DecayLights (void)
                        continue;
                }
 
-               c_dlights++; // count every dlight in use
-
                dl->radius -= time*dl->decay;
                if (dl->radius < 0)
                        dl->radius = 0;
        }
 }
 
-