Added 99% functional weaponmodel bobbing code. It even tries to stop bobbing when...

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 7dec18fff5411538cd62ede1c2a07a5edd6a7e03..9c06485f2fefafca4032ae337f6f8d2ee35b3c84 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?)
@@ -141,10 +136,10 @@ 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;
@@ -351,6 +346,12 @@ typedef struct
        vec3_t  cursor_normal;
        vec_t   cursor_fraction;
        int             cursor_entitynumber;
+
+       double time;
+       double receivetime;
+       int buttons;
+       int impulse;
+       int sequence;
 } usercmd_t;
 
 typedef struct
@@ -455,6 +456,18 @@ client_static_t;
 
 extern client_static_t cls;
 
+typedef struct client_movementqueue_s
+{
+       double time;
+       float frametime;
+       int sequence;
+       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 +523,21 @@ 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;
+       // indicates the queue has been updated and should be replayed
+       qboolean movement_replay;
+       // 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[64];
+       int movesequence;
+       int servermovesequence;
+
 // pitch drifting vars
        float idealpitch;
        float pitchvel;
@@ -525,6 +553,11 @@ typedef struct
        qboolean onground;
        qboolean inwater;
 
+       // used by bob
+       qboolean oldonground;
+       double lastongroundtime;
+       double hitgroundtime;
+
        // don't change view angle, full screen, etc
        int intermission;
        // latched at intermission start
@@ -557,6 +590,19 @@ typedef struct
        // type of game (deathmatch, coop, singleplayer)
        int gametype;
 
+       // models and sounds used by engine code (particularly cl_parse.c)
+       model_t *model_bolt;
+       model_t *model_bolt2;
+       model_t *model_bolt3;
+       model_t *model_beam;
+       sfx_t *sfx_wizhit;
+       sfx_t *sfx_knighthit;
+       sfx_t *sfx_tink1;
+       sfx_t *sfx_ric1;
+       sfx_t *sfx_ric2;
+       sfx_t *sfx_ric3;
+       sfx_t *sfx_r_exp3;
+
 // refresh related state
 
        // cl_entitites[0].model
@@ -574,7 +620,7 @@ typedef struct
        scoreboard_t *scores;
 
        // protocol version of the server we're connected to
-       int protocol;
+       protocolversion_t protocol;
 
        // entity database stuff
        // latest received entity frame numbers
@@ -636,6 +682,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;
@@ -714,7 +765,8 @@ void CL_ExpandEntities(int num);
 
 int  CL_ReadFromServer (void);
 void CL_WriteToServer (void);
-void CL_BaseMove (void);
+void CL_Move (void);
+extern qboolean cl_ignoremousemove;
 
 
 float CL_KeyState (kbutton_t *key);
@@ -753,12 +805,6 @@ float V_CalcRoll (vec3_t angles, vec3_t velocity);
 void V_UpdateBlends (void);
 void V_ParseDamage (void);
 
-
-//
-// cl_tent
-//
-void CL_InitTEnts (void);
-
 //
 // cl_part
 //