renamed cl.protocol to cls.protocol

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 995db0a4b07beb15b470ed0a6c2ede0e9ec4d5b2..9dbe0686255cb9484898d7b549d7a37ede260e51 100644 (file)
--- a/client.h
+++ b/client.h
@@ -35,12 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define LIGHTFLAG_NORMALMODE 1
 #define LIGHTFLAG_REALTIMEMODE 2
 
-extern int cl_max_entities;
-extern int cl_max_static_entities;
-extern int cl_max_temp_entities;
-extern int cl_max_effects;
-extern int cl_max_beams;
-
 typedef struct effect_s
 {
        int active;
@@ -117,6 +111,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;
@@ -317,6 +317,7 @@ entity_persistent_t;
 
 typedef struct entity_s
 {
+       qboolean csqc;
        // baseline state (default values)
        entity_state_t state_baseline;
        // previous state (interpolating from this)
@@ -354,6 +355,7 @@ typedef struct usercmd_s
        int buttons;
        int impulse;
        int sequence;
+       qboolean applied; // if false we're still accumulating a move
 } usercmd_t;
 
 typedef struct lightstyle_s
@@ -444,15 +446,15 @@ typedef struct client_static_s
        double connect_nextsendtime;
        lhnetsocket_t *connect_mysocket;
        lhnetaddress_t connect_address;
+       // protocol version of the server we're connected to
+       // (kept outside client_state_t because it's used between levels)
+       protocolversion_t protocol;
 
 // connection information
        // 0 to SIGNONS
        int signon;
        // network connection
        netconn_t *netcon;
-       // writing buffer to send to server
-       sizebuf_t message;
-       unsigned char message_buf[1024];
 }
 client_static_t;
 
@@ -470,6 +472,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
@@ -528,6 +538,9 @@ typedef struct client_state_s
        // client movement simulation
        // these fields are only updated by CL_ClientMovement (called by CL_SendMove after parsing each network packet)
        qboolean movement;
+       // this is set true by svc_time parsing and causes a new movement to be
+       // queued for prediction purposes
+       qboolean movement_needupdate;
        // indicates the queue has been updated and should be replayed
        qboolean movement_replay;
        // simulated data (this is valid even if cl.movement is false)
@@ -547,6 +560,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;
 
@@ -621,9 +640,6 @@ typedef struct client_state_s
        // [cl.maxclients]
        scoreboard_t *scores;
 
-       // protocol version of the server we're connected to
-       protocolversion_t protocol;
-
        // entity database stuff
        // latest received entity frame numbers
 #define LATESTFRAMENUMS 3
@@ -643,6 +659,9 @@ extern cvar_t cl_pmodel;
 extern cvar_t cl_playermodel;
 extern cvar_t cl_playerskin;
 
+extern cvar_t rcon_password;
+extern cvar_t rcon_address;
+
 extern cvar_t cl_upspeed;
 extern cvar_t cl_forwardspeed;
 extern cvar_t cl_backspeed;
@@ -657,6 +676,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;
 
@@ -689,22 +711,37 @@ extern vec3_t cl_playerstandmaxs;
 extern vec3_t cl_playercrouchmins;
 extern vec3_t cl_playercrouchmaxs;
 
-// these are updated by CL_ClearState
-extern int cl_num_entities;
-extern int cl_num_static_entities;
-extern int cl_num_temp_entities;
-extern int cl_num_brushmodel_entities;
-
 extern mempool_t *cl_mempool;
+
+extern int cl_max_entities;
+extern int cl_max_csqcentities;
+extern int cl_max_static_entities;
+extern int cl_max_temp_entities;
+extern int cl_max_effects;
+extern int cl_max_beams;
+extern int cl_max_dlights;
+extern int cl_max_lightstyle;
+extern int cl_max_brushmodel_entities;
+extern int cl_activedlights;
+
 extern entity_t *cl_entities;
+extern entity_t *cl_csqcentities;      //[515]: csqc
 extern unsigned char *cl_entities_active;
+extern unsigned char *cl_csqcentities_active;  //[515]: csqc
 extern entity_t *cl_static_entities;
 extern entity_t *cl_temp_entities;
-extern int *cl_brushmodel_entities;
 extern cl_effect_t *cl_effects;
 extern beam_t *cl_beams;
 extern dlight_t *cl_dlights;
 extern lightstyle_t *cl_lightstyle;
+extern int *cl_brushmodel_entities;
+
+// these are updated by CL_ClearState
+extern int cl_num_entities;
+extern int cl_num_csqcentities;        //[515]: csqc
+extern int cl_num_static_entities;
+extern int cl_num_temp_entities;
+extern int cl_num_brushmodel_entities;
 
 
 extern client_state_t cl;
@@ -746,7 +783,6 @@ extern      kbutton_t       in_strafe;
 extern         kbutton_t       in_speed;
 
 void CL_InitInput (void);
-void CL_SendCmd (void);
 void CL_SendMove (void);
 
 void CL_ValidateState(entity_state_t *s);
@@ -813,6 +849,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 +905,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;