made reconnect command reconnect to the last server you were on, even if it was an...

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 83dcffaa6bdddb0d72a7808ad9ef688e40330b89..60d605db0c0d1ba61a9a8fd66887c8bf345aa887 100644 (file)
--- a/client.h
+++ b/client.h
@@ -509,6 +509,10 @@ typedef struct client_static_s
        // (note: qw_download variables are also used)
        cl_downloadack_t dp_downloadack[CL_MAX_DOWNLOADACKS];
 
+       // input sequence numbers are not reset on level change, only connect
+       int movesequence;
+       int servermovesequence;
+
        // quakeworld stuff below
 
        // value of "qport" cvar at time of connection
@@ -662,7 +666,8 @@ typedef struct client_state_s
        // use pain anim frame if cl.time < this
        float faceanimtime;
        // for stair smoothing
-       float stairoffset;
+       float stairsmoothz;
+       double stairsmoothtime;
 
        // color shifts for damage, powerups
        cshift_t cshifts[NUM_CSHIFTS];
@@ -708,8 +713,6 @@ typedef struct client_state_s
        // queue of proposed moves
        int movement_numqueue;
        client_movementqueue_t movement_queue[256];
-       int movesequence;
-       int servermovesequence;
        // whether the replay should allow a jump at the first sequence
        qboolean movement_replay_canjump;
 
@@ -927,6 +930,11 @@ typedef struct client_state_s
        int qw_validsequence;
 
        int qw_deltasequence[QW_UPDATE_BACKUP];
+
+       // csqc stuff:
+
+       // collision culling data
+       world_t world;
 }
 client_state_t;
 
@@ -1046,7 +1054,7 @@ void CL_SetInfo(const char *key, const char *value, qboolean send, qboolean allo
 
 int  CL_ReadFromServer (void);
 void CL_WriteToServer (void);
-void CL_Move (void);
+void CL_Input (void);
 extern qboolean cl_ignoremousemove;