moved RecursiveLightPoint code to model_brush.c (model->brush.LightPoint), removing...

[xonotic/darkplaces.git] / pr_cmds.c

diff --git a/pr_cmds.c b/pr_cmds.c
index 956e01e9dd0fab296cb8aa32399316fb29a9de3c..b34e6b7b0eebac878a5930fb374ca784d5e1a8af 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -1843,10 +1843,11 @@ void PF_setspawnparms (void)
 
        ent = G_EDICT(OFS_PARM0);
        i = NUM_FOR_EDICT(ent);
-       if (i < 1 || i > MAX_SCOREBOARD || !(client = svs.connectedclients[i-1]))
+       if (i < 1 || i > MAX_SCOREBOARD || !svs.connectedclients[i-1])
                Host_Error ("Entity is not a client");
 
        // copy spawn parms out of the client_t
+       client = svs.connectedclients[i-1];
        for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
                (&pr_global_struct->parm1)[i] = client->spawn_parms[i];
 }
@@ -1906,7 +1907,6 @@ void PF_randomvec (void)
        VectorCopy (temp, G_VECTOR(OFS_RETURN));
 }
 
-void SV_LightPoint (vec3_t color, vec3_t p);
 /*
 =================
 PF_GetLight
@@ -1921,11 +1921,15 @@ getlight(vector)
 */
 void PF_GetLight (void)
 {
-       vec3_t          color;
-       vec_t*          p;
+       vec3_t ambientcolor, diffusecolor, diffusenormal;
+       vec_t *p;
        p = G_VECTOR(OFS_PARM0);
-       SV_LightPoint (color, p);
-       VectorCopy (color, G_VECTOR(OFS_RETURN));
+       VectorClear(ambientcolor);
+       VectorClear(diffusecolor);
+       VectorClear(diffusenormal);
+       if (sv.worldmodel && sv.worldmodel->brush.LightPoint)
+               sv.worldmodel->brush.LightPoint(sv.worldmodel, p, ambientcolor, diffusecolor, diffusenormal);
+       VectorMA(ambientcolor, 0.5, diffusecolor, G_VECTOR(OFS_RETURN));
 }
 
 #define MAX_QC_CVARS 128