capturevideo: prefill incomplete header fields a bit more defensively: 0xFFFFFFFF...

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 75e3bd8533504445153cb9353c003d6d7da929b3..33bd31d9fdf7e0155d1dac3ebf95b536a8fda248 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -209,7 +209,7 @@ void CL_SetInfo(const char *key, const char *value, qboolean send, qboolean allo
        if (!allowmodel && (!strcasecmp(key, "pmodel") || !strcasecmp(key, "emodel")))
                fail = true;
        for (i = 0;key[i];i++)
-               if (key[i] <= ' ' || key[i] == '\"')
+               if (ISWHITESPACE(key[i]) || key[i] == '\"')
                        fail = true;
        for (i = 0;value[i];i++)
                if (value[i] == '\r' || value[i] == '\n' || value[i] == '\"')
@@ -598,7 +598,7 @@ void CL_ClearTempEntities (void)
        r_refdef.scene.numtempentities = 0;
 }
 
-entity_render_t *CL_NewTempEntity(void)
+entity_render_t *CL_NewTempEntity(double shadertime)
 {
        entity_render_t *render;
 
@@ -610,6 +610,7 @@ entity_render_t *CL_NewTempEntity(void)
        memset (render, 0, sizeof(*render));
        r_refdef.scene.entities[r_refdef.scene.numentities++] = render;
 
+       render->shadertime = shadertime;
        render->alpha = 1;
        VectorSet(render->colormod, 1, 1, 1);
        return render;
@@ -750,7 +751,9 @@ void CL_RelinkLightFlashes(void)
                        {
                                tempmatrix = dl->matrix;
                                Matrix4x4_Scale(&tempmatrix, dl->radius, 1);
-                               R_RTLight_Update(&r_refdef.scene.lights[r_refdef.scene.numlights++], false, &tempmatrix, dl->color, dl->style, dl->cubemapname, dl->shadow, dl->corona, dl->coronasizescale, dl->ambientscale, dl->diffusescale, dl->specularscale, dl->flags);
+                               // we need the corona fading to be persistent
+                               R_RTLight_Update(&dl->rtlight, false, &tempmatrix, dl->color, dl->style, dl->cubemapname, dl->shadow, dl->corona, dl->coronasizescale, dl->ambientscale, dl->diffusescale, dl->specularscale, dl->flags);
+                               r_refdef.scene.lights[r_refdef.scene.numlights++] = &dl->rtlight;
                        }
                }
        }
@@ -820,7 +823,7 @@ void CL_AddQWCTFFlagModel(entity_t *player, int skin)
        }
        // end of code taken from QuakeWorld
 
-       flagrender = CL_NewTempEntity();
+       flagrender = CL_NewTempEntity(player->render.shadertime);
        if (!flagrender)
                return;
 
@@ -1361,7 +1364,8 @@ void CL_LinkNetworkEntity(entity_t *e)
                Matrix4x4_SetOrigin(&tempmatrix, trace.endpos[0], trace.endpos[1], trace.endpos[2]);
                Matrix4x4_Scale(&tempmatrix, 150, 1);
                VectorSet(color, e->persistent.muzzleflash * 4.0f, e->persistent.muzzleflash * 4.0f, e->persistent.muzzleflash * 4.0f);
-               R_RTLight_Update(&r_refdef.scene.lights[r_refdef.scene.numlights++], false, &tempmatrix, color, -1, NULL, true, 0, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+               R_RTLight_Update(&r_refdef.scene.templights[r_refdef.scene.numlights], false, &tempmatrix, color, -1, NULL, true, 0, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+               r_refdef.scene.lights[r_refdef.scene.numlights] = &r_refdef.scene.templights[r_refdef.scene.numlights++];
        }
        // LordHavoc: if the model has no flags, don't check each
        if (e->render.model && e->render.effects && !(e->render.flags & RENDER_VIEWMODEL))
@@ -1392,17 +1396,6 @@ void CL_LinkNetworkEntity(entity_t *e)
                dlightradius = max(dlightradius, e->state_current.glowsize * 4);
                VectorMA(dlightcolor, (1.0f / 255.0f), palette_rgb[e->state_current.glowcolor], dlightcolor);
        }
-       // make the glow dlight
-       if (dlightradius > 0 && (dlightcolor[0] || dlightcolor[1] || dlightcolor[2]) && !(e->render.flags & RENDER_VIEWMODEL) && r_refdef.scene.numlights < MAX_DLIGHTS)
-       {
-               matrix4x4_t dlightmatrix;
-               Matrix4x4_Normalize(&dlightmatrix, &e->render.matrix);
-               // hack to make glowing player light shine on their gun
-               //if (e->state_current.number == cl.viewentity/* && !chase_active.integer*/)
-               //      Matrix4x4_AdjustOrigin(&dlightmatrix, 0, 0, 30);
-               Matrix4x4_Scale(&dlightmatrix, dlightradius, 1);
-               R_RTLight_Update(&r_refdef.scene.lights[r_refdef.scene.numlights++], false, &dlightmatrix, dlightcolor, -1, NULL, true, 1, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-       }
        // custom rtlight
        if ((e->state_current.lightpflags & PFLAGS_FULLDYNAMIC) && r_refdef.scene.numlights < MAX_DLIGHTS)
        {
@@ -1417,7 +1410,20 @@ void CL_LinkNetworkEntity(entity_t *e)
                // FIXME: add ambient/diffuse/specular scales as an extension ontop of TENEBRAE_GFX_DLIGHTS?
                Matrix4x4_Normalize(&dlightmatrix, &e->render.matrix);
                Matrix4x4_Scale(&dlightmatrix, light[3], 1);
-               R_RTLight_Update(&r_refdef.scene.lights[r_refdef.scene.numlights++], false, &dlightmatrix, light, e->state_current.lightstyle, e->state_current.skin > 0 ? va("cubemaps/%i", e->state_current.skin) : NULL, !(e->state_current.lightpflags & PFLAGS_NOSHADOW), (e->state_current.lightpflags & PFLAGS_CORONA) != 0, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+               R_RTLight_Update(&r_refdef.scene.templights[r_refdef.scene.numlights], false, &dlightmatrix, light, e->state_current.lightstyle, e->state_current.skin > 0 ? va("cubemaps/%i", e->state_current.skin) : NULL, !(e->state_current.lightpflags & PFLAGS_NOSHADOW), (e->state_current.lightpflags & PFLAGS_CORONA) != 0, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+               r_refdef.scene.lights[r_refdef.scene.numlights] = &r_refdef.scene.templights[r_refdef.scene.numlights++];
+       }
+       // make the glow dlight
+       else if (dlightradius > 0 && (dlightcolor[0] || dlightcolor[1] || dlightcolor[2]) && !(e->render.flags & RENDER_VIEWMODEL) && r_refdef.scene.numlights < MAX_DLIGHTS)
+       {
+               matrix4x4_t dlightmatrix;
+               Matrix4x4_Normalize(&dlightmatrix, &e->render.matrix);
+               // hack to make glowing player light shine on their gun
+               //if (e->state_current.number == cl.viewentity/* && !chase_active.integer*/)
+               //      Matrix4x4_AdjustOrigin(&dlightmatrix, 0, 0, 30);
+               Matrix4x4_Scale(&dlightmatrix, dlightradius, 1);
+               R_RTLight_Update(&r_refdef.scene.templights[r_refdef.scene.numlights], false, &dlightmatrix, dlightcolor, -1, NULL, true, 1, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+               r_refdef.scene.lights[r_refdef.scene.numlights] = &r_refdef.scene.templights[r_refdef.scene.numlights++];
        }
        // do trail light
        if (e->render.flags & RENDER_GLOWTRAIL)
@@ -1528,7 +1534,7 @@ static void CL_RelinkEffects(void)
 
                        // if we're drawing effects, get a new temp entity
                        // (NewTempEntity adds it to the render entities list for us)
-                       if (r_draweffects.integer && (entrender = CL_NewTempEntity()))
+                       if (r_draweffects.integer && (entrender = CL_NewTempEntity(e->starttime)))
                        {
                                // interpolation stuff
                                entrender->frame1 = intframe;
@@ -1618,7 +1624,8 @@ void CL_RelinkBeams(void)
                                vec3_t dlightcolor;
                                VectorSet(dlightcolor, 0.3, 0.7, 1);
                                Matrix4x4_CreateFromQuakeEntity(&tempmatrix, end[0], end[1], end[2], 0, 0, 0, 200);
-                               R_RTLight_Update(&r_refdef.scene.lights[r_refdef.scene.numlights++], false, &tempmatrix, dlightcolor, -1, NULL, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                               R_RTLight_Update(&r_refdef.scene.templights[r_refdef.scene.numlights], false, &tempmatrix, dlightcolor, -1, NULL, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                               r_refdef.scene.lights[r_refdef.scene.numlights] = &r_refdef.scene.templights[r_refdef.scene.numlights++];
                        }
                        if (cl_beams_polygons.integer)
                                continue;
@@ -1652,7 +1659,7 @@ void CL_RelinkBeams(void)
                d = VectorNormalizeLength(dist);
                while (d > 0)
                {
-                       entrender = CL_NewTempEntity ();
+                       entrender = CL_NewTempEntity (0);
                        if (!entrender)
                                return;
                        //VectorCopy (org, ent->render.origin);
@@ -1684,7 +1691,7 @@ static void CL_RelinkQWNails(void)
 
                // if we're drawing effects, get a new temp entity
                // (NewTempEntity adds it to the render entities list for us)
-               if (!(entrender = CL_NewTempEntity()))
+               if (!(entrender = CL_NewTempEntity(0)))
                        continue;
 
                // normal stuff
@@ -1929,7 +1936,7 @@ void CL_Locs_AddNode(vec3_t mins, vec3_t maxs, const char *name)
        if (!name)
                name = "";
        namelen = strlen(name);
-       node = Mem_Alloc(cls.levelmempool, sizeof(cl_locnode_t) + namelen + 1);
+       node = (cl_locnode_t *) Mem_Alloc(cls.levelmempool, sizeof(cl_locnode_t) + namelen + 1);
        VectorSet(node->mins, min(mins[0], maxs[0]), min(mins[1], maxs[1]), min(mins[2], maxs[2]));
        VectorSet(node->maxs, max(mins[0], maxs[0]), max(mins[1], maxs[1]), max(mins[2], maxs[2]));
        node->name = (char *)(node + 1);
@@ -2097,10 +2104,10 @@ void CL_Locs_Reload_f(void)
                if (text < textend)
                        text++;
                // trim trailing whitespace
-               while (lineend > linestart && lineend[-1] <= ' ')
+               while (lineend > linestart && ISWHITESPACE(lineend[-1]))
                        lineend--;
                // trim leading whitespace
-               while (linestart < lineend && *linestart <= ' ')
+               while (linestart < lineend && ISWHITESPACE(*linestart))
                        linestart++;
                // check if this is a comment
                if (linestart + 2 <= lineend && !strncmp(linestart, "//", 2))
@@ -2117,7 +2124,7 @@ void CL_Locs_Reload_f(void)
                        else
                                maxs[i - 3] = atof(linetext);
                        // now advance past the number
-                       while (linetext < lineend && *linetext > ' ' && *linetext != ',')
+                       while (linetext < lineend && !ISWHITESPACE(*linetext) && *linetext != ',')
                                linetext++;
                        // advance through whitespace
                        if (linetext < lineend)
@@ -2128,10 +2135,10 @@ void CL_Locs_Reload_f(void)
                                        limit = 6;
                                        // note: comma can be followed by whitespace
                                }
-                               if (*linetext <= ' ')
+                               if (ISWHITESPACE(*linetext))
                                {
                                        // skip whitespace
-                                       while (linetext < lineend && *linetext <= ' ')
+                                       while (linetext < lineend && ISWHITESPACE(*linetext))
                                                linetext++;
                                }
                        }