made the QueueWantsMore message a Con_DPrintf

[xonotic/darkplaces.git] / r_light.c

diff --git a/r_light.c b/r_light.c
index 1d5c2cbb6216e0f50dde08cf48dc8b671ba669a9..e233ff7e188c4ffdc98a77cd539fa62f2e8c7f1c 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -53,7 +53,7 @@ void r_light_start(void)
                        pixels[y][x][3] = 255;
                }
        }
-       lightcorona = R_LoadTexture (lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE);
+       lightcorona = R_LoadTexture2D(lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
 }
 
 void r_light_shutdown(void)
@@ -205,7 +205,6 @@ DYNAMIC LIGHTS
 R_MarkLights
 =============
 */
-extern int r_pvsframecount;
 static void R_OldMarkLights (entity_render_t *ent, vec3_t lightorigin, rdlight_t *rd, int bit, int bitindex, mnode_t *node)
 {
        float ndist, maxdist;
@@ -242,7 +241,7 @@ loc0:
        surf = ent->model->surfaces + node->firstsurface;
        for (i = 0;i < node->numsurfaces;i++, surf++)
        {
-               if (surfacepvsframes[surf->number] != r_pvsframecount)
+               if (surfacepvsframes[surf->number] != ent->model->pvsframecount)
                        continue;
                dist = ndist;
                if (surf->flags & SURF_PLANEBACK)
@@ -382,7 +381,7 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b
                                                        if (surf->lightframe == lightframe)
                                                                continue;
                                                        surf->lightframe = lightframe;
-                                                       if (surfacepvsframes[surf->number] != r_pvsframecount)
+                                                       if (surfacepvsframes[surf->number] != model->pvsframecount)
                                                                continue;
                                                        dist = PlaneDiff(lightorigin, surf->plane);
                                                        if (surf->flags & SURF_PLANEBACK)
@@ -867,7 +866,7 @@ void R_LightModel(const entity_render_t *ent, int numverts, float *vertices, flo
                        avc[3] = a;
                        avc += 4;
                        av += 4;
-                       avn += 3;
+                       avn += 4;
                }
        }
        else