client: Move usercmd_t to protocol.h since both client and server use it

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12985 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/client.h b/client.h
index f561d06ebeb672d12f0902449df5d12a46c3317f..7d185561ce88121eef5cead4426e8ec544e3ec6f 100644 (file)
--- a/client.h
+++ b/client.h
@@ -479,40 +479,6 @@ typedef struct entity_s
 }
 entity_t;
 
-typedef struct usercmd_s
-{
-       vec3_t  viewangles;
-
-// intended velocities
-       float   forwardmove;
-       float   sidemove;
-       float   upmove;
-
-       vec3_t  cursor_screen;
-       vec3_t  cursor_start;
-       vec3_t  cursor_end;
-       vec3_t  cursor_impact;
-       vec3_t  cursor_normal;
-       vec_t   cursor_fraction;
-       int             cursor_entitynumber;
-
-       double time; // time the move is executed for (cl_movement: clienttime, non-cl_movement: receivetime)
-       double receivetime; // time the move was received at
-       double clienttime; // time to which server state the move corresponds to
-       int msec; // for predicted moves
-       int buttons;
-       int impulse;
-       unsigned int sequence;
-       qbool applied; // if false we're still accumulating a move
-       qbool predicted; // if true the sequence should be sent as 0
-
-       // derived properties
-       double frametime;
-       qbool canjump;
-       qbool jump;
-       qbool crouch;
-} usercmd_t;
-
 typedef struct lightstyle_s
 {
        int             length;

diff --git a/protocol.h b/protocol.h
index 7fde83121d12b2e6badc6b78a7ed2ffcacec456a..170db5b9ecb5e5158da187a7635731c721af7dcb 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -371,6 +371,40 @@ void Protocol_Names(char *buffer, size_t buffersize);
 #define RENDER_CUSTOMIZEDMODELLIGHT 4096
 #define RENDER_DYNAMICMODELLIGHT 8388608 // origin dependent model light
 
+typedef struct usercmd_s
+{
+       vec3_t  viewangles;
+
+// intended velocities
+       float   forwardmove;
+       float   sidemove;
+       float   upmove;
+
+       vec3_t  cursor_screen;
+       vec3_t  cursor_start;
+       vec3_t  cursor_end;
+       vec3_t  cursor_impact;
+       vec3_t  cursor_normal;
+       vec_t   cursor_fraction;
+       int             cursor_entitynumber;
+
+       double time; // time the move is executed for (cl_movement: clienttime, non-cl_movement: receivetime)
+       double receivetime; // time the move was received at
+       double clienttime; // time to which server state the move corresponds to
+       int msec; // for predicted moves
+       int buttons;
+       int impulse;
+       unsigned int sequence;
+       qbool applied; // if false we're still accumulating a move
+       qbool predicted; // if true the sequence should be sent as 0
+
+       // derived properties
+       double frametime;
+       qbool canjump;
+       qbool jump;
+       qbool crouch;
+} usercmd_t;
+
 #define MAX_FRAMEGROUPBLENDS 4
 typedef struct framegroupblend_s
 {