Fix for Win64, by Willis

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 28a0c65c51e960925f42289bee06c996772a990d..aa323fcd9520cdeba82d24158909bc2ac43d14e4 100644 (file)
--- a/client.h
+++ b/client.h
@@ -117,6 +117,12 @@ typedef struct rtlight_s
        // squared cullradius
        //vec_t cullradius2;
 
+       // rendering properties, updated each time a light is rendered
+       // this is rtlight->color * d_lightstylevalue
+       vec3_t currentcolor;
+       // this is R_Shadow_Cubemap(rtlight->cubemapname)
+       rtexture_t *currentcubemap;
+
        // lightmap renderer stuff (remove someday!)
        // the size of the light
        vec_t lightmap_cullradius;
@@ -138,7 +144,7 @@ typedef struct rtlight_s
        int static_numleafs;
        int static_numleafpvsbytes;
        int *static_leaflist;
-       qbyte *static_leafpvs;
+       unsigned char *static_leafpvs;
        // surfaces seen by light
        int static_numsurfaces;
        int *static_surfacelist;
@@ -317,6 +323,7 @@ entity_persistent_t;
 
 typedef struct entity_s
 {
+       qboolean csqc;
        // baseline state (default values)
        entity_state_t state_baseline;
        // previous state (interpolating from this)
@@ -452,7 +459,7 @@ typedef struct client_static_s
        netconn_t *netcon;
        // writing buffer to send to server
        sizebuf_t message;
-       qbyte message_buf[1024];
+       unsigned char message_buf[1024];
 }
 client_static_t;
 
@@ -470,6 +477,14 @@ typedef struct client_movementqueue_s
 }
 client_movementqueue_t;
 
+//[515]: csqc
+typedef struct
+{
+       qboolean drawworld;
+       qboolean drawenginesbar;
+       qboolean drawcrosshair;
+}csqc_vidvars_t;
+
 //
 // the client_state_t structure is wiped completely at every
 // server signon
@@ -547,6 +562,12 @@ typedef struct client_state_s
        float driftmove;
        double laststop;
 
+//[515]: added for csqc purposes
+       float sensitivityscale;
+       csqc_vidvars_t csqc_vidvars;    //[515]: these parms must be set to true by default
+       qboolean csqc_wantsmousemove;
+       struct model_s *csqc_model_precache[MAX_MODELS];
+
        // local amount for smoothing stepups
        //float crouch;
 
@@ -657,6 +678,9 @@ extern cvar_t cl_anglespeedkey;
 
 extern cvar_t cl_autofire;
 
+extern cvar_t csqc_progname;   //[515]: csqc crc check and right csprogs name according to progs.dat
+extern cvar_t csqc_progcrc;
+
 extern cvar_t cl_shownet;
 extern cvar_t cl_nolerp;
 
@@ -691,13 +715,16 @@ extern vec3_t cl_playercrouchmaxs;
 
 // these are updated by CL_ClearState
 extern int cl_num_entities;
+extern int cl_num_csqcentities;
 extern int cl_num_static_entities;
 extern int cl_num_temp_entities;
 extern int cl_num_brushmodel_entities;
 
 extern mempool_t *cl_mempool;
 extern entity_t *cl_entities;
-extern qbyte *cl_entities_active;
+extern entity_t *cl_csqcentities;
+extern unsigned char *cl_entities_active;
+extern unsigned char *cl_csqcentities_active;
 extern entity_t *cl_static_entities;
 extern entity_t *cl_temp_entities;
 extern int *cl_brushmodel_entities;
@@ -813,6 +840,7 @@ void V_ParseDamage (void);
 extern cvar_t cl_particles;
 extern cvar_t cl_particles_quality;
 extern cvar_t cl_particles_size;
+extern cvar_t cl_particles_quake;
 extern cvar_t cl_particles_bloodshowers;
 extern cvar_t cl_particles_blood;
 extern cvar_t cl_particles_blood_alpha;
@@ -868,11 +896,11 @@ typedef struct refdef_s
 {
        // area to render in
        int x, y, width, height;
-       float fov_x, fov_y;
+       float frustum_x, frustum_y;
 
        // these are set for water warping before
-       // fov_x/fov_y are calculated
-       float fovscale_x, fovscale_y;
+       // frustum_x/frustum_y are calculated
+       float frustumscale_x, frustumscale_y;
 
        // view transform
        matrix4x4_t viewentitymatrix;
@@ -910,7 +938,7 @@ typedef struct refdef_s
 
        // 2D art drawing queue
        // TODO: get rid of this
-       qbyte *drawqueue;
+       unsigned char *drawqueue;
        int drawqueuesize;
        int maxdrawqueuesize;
 }