X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=client.h;h=578cd68443b99772f5172e0fa75b4981d864706a;hb=c60119cef7f0b44169ddb4c7d688976f9f9283ae;hp=4713f19dffb34561c45c4768529e1c6488d73978;hpb=ef35a088cb3ab1900acdbd5285465cd845368e79;p=xonotic%2Fdarkplaces.git

diff --git a/client.h b/client.h
index 4713f19d..578cd684 100644
--- a/client.h
+++ b/client.h
@@ -231,7 +231,8 @@ typedef struct
 #define	CSHIFT_DAMAGE	1
 #define	CSHIFT_BONUS	2
 #define	CSHIFT_POWERUP	3
-#define	NUM_CSHIFTS		4
+#define	CSHIFT_VCSHIFT	4
+#define	NUM_CSHIFTS		5
 
 #define	NAME_LENGTH	64
 
@@ -308,6 +309,9 @@ extern client_static_t	cls;
 //
 typedef struct
 {
+	// true if playing in a local game and no one else is connected
+	int islocalgame;
+
 	// when connecting to the server throw out the first couple move messages
 	// so the player doesn't accidentally do something the first frame
 	int movemessages;
@@ -325,6 +329,8 @@ typedef struct
 	int items;
 	// cl.time of acquiring item, for blinking
 	float item_gettime[32];
+	// cl.time of changing STAT_ACTIVEWEAPON
+	float weapontime;
 	// use pain anim frame if cl.time < this
 	float faceanimtime;
 
@@ -422,9 +428,12 @@ typedef struct
 	// for interpolation
 	float viewzoomold, viewzoomnew;
 
+	// protocol version of the server we're connected to
+	int protocol;
+
 	// entity database stuff
 	entity_database_t entitydatabase;
-	entity_database4_t entitydatabase4;
+	entity_database4_t *entitydatabase4;
 }
 client_state_t;
 
@@ -527,7 +536,7 @@ extern 	kbutton_t 	in_strafe;
 extern 	kbutton_t 	in_speed;
 
 void CL_InitInput (void);
-void CL_SendCmd (void);
+void CL_SendCmd (usercmd_t *cmd);
 void CL_SendMove (usercmd_t *cmd);
 
 void CL_LerpUpdate(entity_t *e);
@@ -628,9 +637,8 @@ typedef struct
 	int x, y, width, height;
 	float fov_x, fov_y;
 
-	// view point
-	vec3_t vieworg;
-	vec3_t viewangles;
+	// view transform
+	matrix4x4_t viewentitymatrix;
 
 	// fullscreen color blend
 	float viewblend[4];