relocated the CL_SendMove call to put it at the end of network parsing (and only...

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index d592f9d4dc27f45ea55c84e7c07923510656b591..425f4a83d84fd9fcff04105dd84ba3d8e6a73b38 100644 (file)
--- a/client.h
+++ b/client.h
@@ -141,10 +141,13 @@ typedef struct rtlight_s
        shadowmesh_t *static_meshchain_shadow;
        shadowmesh_t *static_meshchain_light;
        // used for visibility testing (more exact than bbox)
-       int static_numclusters;
-       int static_numclusterpvsbytes;
-       int *static_clusterlist;
-       qbyte *static_clusterpvs;
+       int static_numleafs;
+       int static_numleafpvsbytes;
+       int *static_leaflist;
+       qbyte *static_leafpvs;
+       // surfaces seen by light
+       int static_numsurfaces;
+       int *static_surfacelist;
 }
 rtlight_t;
 
@@ -446,11 +449,22 @@ typedef struct
        netconn_t *netcon;
        // writing buffer to send to server
        sizebuf_t message;
+       qbyte message_buf[1024];
 }
 client_static_t;
 
 extern client_static_t cls;
 
+typedef struct client_movementqueue_s
+{
+       double time;
+       float viewangles[3];
+       float move[3];
+       qboolean jump;
+       qboolean crouch;
+}
+client_movementqueue_t;
+
 //
 // the client_state_t structure is wiped completely at every
 // server signon
@@ -506,6 +520,16 @@ typedef struct
        // update by server, can be used by mods for zooming
        vec_t mviewzoom[2], viewzoom;
 
+       // client movement simulation
+       // these fields are only updated by CL_ClientMovement (called by CL_SendMove after parsing each network packet)
+       qboolean movement;
+       // simulated origin
+       vec3_t movement_origin;
+       vec3_t movement_oldorigin;
+       // queue of proposed moves
+       int movement_numqueue;
+       client_movementqueue_t movement_queue[256];
+
 // pitch drifting vars
        float idealpitch;
        float pitchvel;
@@ -581,8 +605,6 @@ typedef struct
 }
 client_state_t;
 
-extern mempool_t *cl_scores_mempool;
-
 //
 // cvars
 //
@@ -634,18 +656,23 @@ extern cvar_t cl_stainmaps_clearonload;
 
 extern cvar_t cl_prydoncursor;
 
+extern vec3_t cl_playerstandmins;
+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_entities_mempool;
+extern mempool_t *cl_mempool;
 extern entity_t *cl_entities;
 extern qbyte *cl_entities_active;
 extern entity_t *cl_static_entities;
 extern entity_t *cl_temp_entities;
-extern entity_render_t **cl_brushmodel_entities;
+extern int *cl_brushmodel_entities;
 extern cl_effect_t *cl_effects;
 extern beam_t *cl_beams;
 extern dlight_t *cl_dlights;
@@ -707,6 +734,7 @@ entity_t *CL_NewTempEntity (void);
 void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate);
 
 void CL_ClearState (void);
+void CL_ExpandEntities(int num);
 
 
 int  CL_ReadFromServer (void);
@@ -860,8 +888,6 @@ refdef_t;
 
 refdef_t r_refdef;
 
-extern mempool_t *cl_refdef_mempool;
-
 #include "cgamevm.h"
 
 #endif