PR_Alloc/Free/FreeAll now report filename/fileline of their caller in the Mem_ calls...

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 5164516749d16f0053213476d4515ebf8d35eab5..a5e9f2c2a4c1e199737bd127847e4ce4fa0e33d2 100644 (file)
--- a/client.h
+++ b/client.h
@@ -83,11 +83,6 @@ typedef struct rtlight_s
        // core properties
        // matrix for transforming world coordinates to light filter coordinates
        matrix4x4_t matrix_worldtolight;
-       // based on worldtolight this transforms -1 to +1 to 0 to 1 for purposes
-       // of attenuation texturing in full 3D (Z result often ignored)
-       matrix4x4_t matrix_worldtoattenuationxyz;
-       // this transforms only the Z to S, and T is always 0.5
-       matrix4x4_t matrix_worldtoattenuationz;
        // typically 1 1 1, can be lower (dim) or higher (overbright)
        vec3_t color;
        // size of the light (remove?)
@@ -455,6 +450,16 @@ 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
@@ -510,6 +515,17 @@ 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 data (this is valid even if cl.movement is false)
+       vec3_t movement_origin;
+       vec3_t movement_oldorigin;
+       vec3_t movement_velocity;
+       // queue of proposed moves
+       int movement_numqueue;
+       client_movementqueue_t movement_queue[256];
+
 // pitch drifting vars
        float idealpitch;
        float pitchvel;
@@ -636,6 +652,11 @@ 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;