From: cloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 2 Oct 2020 01:56:51 +0000 (+0000)
Subject: client: Move usercmd_t to protocol.h since both client and server use it
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5186c7035f30e25e980aa1ee49b1759121b10db;p=xonotic%2Fdarkplaces.git

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 f561d06e..7d185561 100644
--- 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 7fde8312..170db5b9 100644
--- 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
 {