fix crash with predicted player locations

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index a8936258522324677e9c52b37ea114c78839b079..71a2d80afceb0d976e37e36fc07502986729d4d3 100644 (file)
--- a/render.h
+++ b/render.h
@@ -195,8 +195,7 @@ extern rtexture_t *r_texture_normalizationcube;
 extern rtexture_t *r_texture_fogattenuation;
 //extern rtexture_t *r_texture_fogintensity;
 
-#define R_MAX_OCCLUSION_QUERIES 4096
-extern unsigned int r_queries[R_MAX_OCCLUSION_QUERIES];
+extern unsigned int r_queries[MAX_OCCLUSION_QUERIES];
 extern unsigned int r_numqueries;
 extern unsigned int r_maxqueries;
 
@@ -307,6 +306,7 @@ typedef struct rsurfacestate_s
        int ent_flags;
        float ent_shadertime;
        float ent_color[4];
+       int ent_alttextures; // used by q1bsp animated textures (pressed buttons)
        // transform matrices to render this entity and effects on this entity
        matrix4x4_t matrix;
        matrix4x4_t inversematrix;
@@ -450,13 +450,11 @@ typedef struct r_waterstate_waterplane_s
        rtexture_t *texture_reflection;
        mplane_t plane;
        int materialflags; // combined flags of all water surfaces on this plane
-       unsigned char pvsbits[(32768+7)>>3]; // FIXME: buffer overflow on huge maps
+       unsigned char pvsbits[(MAX_MAP_LEAFS+7)>>3]; // FIXME: buffer overflow on huge maps
        qboolean pvsvalid;
 }
 r_waterstate_waterplane_t;
 
-#define MAX_WATERPLANES 16
-
 typedef struct r_waterstate_s
 {
        qboolean enabled;