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 60cd20ef79812e23d9d13685495ace9b43fa3ea1..9c06485f2fefafca4032ae337f6f8d2ee35b3c84 100644 (file)
--- a/client.h
+++ b/client.h
@@ -351,6 +351,7 @@ typedef struct
        double receivetime;
        int buttons;
        int impulse;
+       int sequence;
 } usercmd_t;
 
 typedef struct
@@ -459,6 +460,7 @@ typedef struct client_movementqueue_s
 {
        double time;
        float frametime;
+       int sequence;
        float viewangles[3];
        float move[3];
        qboolean jump;
@@ -524,13 +526,17 @@ typedef struct
        // 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[256];
+       client_movementqueue_t movement_queue[64];
+       int movesequence;
+       int servermovesequence;
 
 // pitch drifting vars
        float idealpitch;
@@ -547,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
@@ -579,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
@@ -596,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
@@ -781,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
 //