split up DrawQ_String_Font_UntilX in DrawQ_TextWidth_Font_TrackColors and DrawQ_Strin...

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 3008887dafb7ee5e488381562257ba9508971876..b98beec1b48092dbf152b0220539a2a16b66b81e 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1231,7 +1231,6 @@ extern cvar_t cl_particles_blood;
 extern cvar_t cl_particles_blood_alpha;
 extern cvar_t cl_particles_blood_bloodhack;
 extern cvar_t cl_particles_bulletimpacts;
-extern cvar_t cl_particles_explosions_smoke;
 extern cvar_t cl_particles_explosions_sparks;
 extern cvar_t cl_particles_explosions_shell;
 extern cvar_t cl_particles_rain;
@@ -1314,11 +1313,9 @@ void Debug_PolygonEnd(void);
 
 extern qboolean sb_showscores;
 
-#define NUMCROSSHAIRS 32
-extern cachepic_t *r_crosshairs[NUMCROSSHAIRS+1];
-
 float FogPoint_World(const vec3_t p);
 float FogPoint_Model(const vec3_t p);
+float FogForDistance(vec_t dist);
 
 typedef struct r_refdef_stats_s
 {
@@ -1329,6 +1326,8 @@ typedef struct r_refdef_stats_s
        int world_portals;
        int world_surfaces;
        int world_triangles;
+       int lightmapupdates;
+       int lightmapupdatepixels;
        int particles;
        int decals;
        int meshes;
@@ -1385,9 +1384,11 @@ typedef struct r_refdef_s
        rtlight_t lights[MAX_DLIGHTS];
        int numlights;
 
+       // intensities for light styles right now, controls rtlights
+       float rtlightstylevalue[256];   // float fraction of base light value
        // 8.8bit fixed point intensities for light styles
-       // controls intensity of dynamic lights and lightmap layers
-       unsigned short  lightstylevalue[256];   // 8.8 fraction of base light value
+       // controls intensity lightmap layers
+       unsigned short lightstylevalue[256];    // 8.8 fraction of base light value
 
        vec3_t fogcolor;
        vec_t fogrange;
@@ -1399,6 +1400,7 @@ typedef struct r_refdef_s
        float fog_red;
        float fog_green;
        float fog_blue;
+       float fog_start, fog_end;
        qboolean fogenabled;
        qboolean oldgl_fogenable;