X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=client.h;h=fdf1a7881f5b1c9316056c65ff514c93feaaeee5;hp=8e6d0f50dba4625435d23164ce20accc2242c33d;hb=HEAD;hpb=2ccc0bb94e77f4b95e4228178099c3a13fb17ea2

diff --git a/client.h b/client.h
index 8e6d0f50..3cfaf5bf 100644
--- a/client.h
+++ b/client.h
@@ -894,7 +894,7 @@ typedef struct client_state_s
 	char sound_name[MAX_SOUNDS][MAX_QPATH];
 
 	// for display on solo scoreboard
-	char worldmessage[40]; // map title (not related to filename)
+	char worldmessage[MAX_QPATH]; // map title (not related to filename)
 	// variants of map name
 	char worldbasename[MAX_QPATH]; // %s
 	char worldname[MAX_QPATH]; // maps/%s.bsp
@@ -1048,6 +1048,8 @@ typedef struct client_state_s
 
 	// time accumulated since an input packet was sent
 	float timesincepacket;
+	// how many optimally timed inputs we sent since we received an update from the server
+	uint8_t opt_inputs_since_update;
 
 	// movement parameters for client prediction
 	unsigned int moveflags;
@@ -1107,7 +1109,6 @@ typedef struct client_state_s
 	// csqc stuff:
 	// server entity number corresponding to a clientside entity
 	unsigned short csqc_server2csqcentitynumber[MAX_EDICTS];
-	qbool csqc_loaded;
 	vec3_t csqc_vieworigin;
 	vec3_t csqc_viewangles;
 	vec3_t csqc_vieworiginfromengine;
@@ -1116,6 +1117,7 @@ typedef struct client_state_s
 	qbool csqc_usecsqclistener;
 	matrix4x4_t csqc_listenermatrix;
 	char csqc_printtextbuf[MAX_INPUTLINE];
+	size_t csqc_printtextbuf_len; ///< strlen
 
 	// collision culling data
 	world_t world;
@@ -1133,6 +1135,9 @@ typedef struct client_state_s
 
 	// used by EntityState5_ReadUpdate
 	skeleton_t *engineskeletonobjects;
+
+	// used by underwater sound filter (snd_waterfx)
+	qbool view_underwater;
 }
 client_state_t;
 
@@ -1165,7 +1170,6 @@ extern cvar_t cl_anglespeedkey;
 extern cvar_t cl_autofire;
 
 extern cvar_t cl_shownet;
-extern cvar_t cl_nolerp;
 extern cvar_t cl_nettimesyncfactor;
 extern cvar_t cl_nettimesyncboundmode;
 extern cvar_t cl_nettimesyncboundtolerance;
@@ -1185,6 +1189,7 @@ extern cvar_t m_side;
 extern cvar_t cl_autodemo;
 extern cvar_t cl_autodemo_nameformat;
 extern cvar_t cl_autodemo_delete;
+extern cvar_t cl_startdemos;
 
 extern cvar_t r_draweffects;
 
@@ -1201,6 +1206,8 @@ extern cvar_t cl_prydoncursor_notrace;
 
 extern cvar_t cl_locs_enable;
 
+extern cvar_t cl_areagrid_link_SOLID_NOT;
+
 extern client_state_t cl;
 
 extern void CL_AllocLightFlash (entity_render_t *ent, matrix4x4_t *matrix, float radius, float red, float green, float blue, float decay, float lifetime, char *cubemapname, int style, int shadowenable, vec_t corona, vec_t coronasizescale, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int flags);
@@ -1223,7 +1230,8 @@ void CL_StartVideo(void);
 
 void CL_EstablishConnection(const char *host, int firstarg);
 
-void CL_Disconnect (void);
+void CL_Disconnect(void);
+void CL_DisconnectEx(qbool kicked, const char *reason, ... );
 void CL_Disconnect_f(cmd_state_t *cmd);
 
 void CL_UpdateRenderEntity(entity_render_t *ent);
@@ -1363,6 +1371,7 @@ extern model_t cl_meshentitymodels[NUM_MESHENTITIES];
 extern const char *cl_meshentitynames[NUM_MESHENTITIES];
 #define CL_Mesh_Scene() (&cl_meshentitymodels[MESH_SCENE])
 #define CL_Mesh_UI() (&cl_meshentitymodels[MESH_UI])
+void CL_MeshEntities_Init(void);
 void CL_MeshEntities_Scene_Clear(void);
 void CL_MeshEntities_Scene_AddRenderEntity(void);
 void CL_MeshEntities_Scene_FinalizeRenderEntity(void);