X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=client.h;h=3e007c70bde34b181c6f6739917f2a2e4def9d21;hp=6c23f812e9c5641c77f29f764e2a59d7eac010df;hb=0706fdfa8e33548670e59234409eac2c51849631;hpb=ce12b0f5cc246070427a805bb3078163bcff2490

diff --git a/client.h b/client.h
index 6c23f812..3e007c70 100644
--- a/client.h
+++ b/client.h
@@ -54,7 +54,7 @@ tridecal_t;
 
 typedef struct decalsystem_s
 {
-	dp_model_t *model;
+	model_t *model;
 	double lastupdatetime;
 	int maxdecals;
 	int freedecal;
@@ -74,7 +74,7 @@ typedef struct effect_s
 	vec3_t origin;
 	double starttime;
 	float framerate;
-	dp_model_t *model;
+	model_t *model;
 	int startframe;
 	int endframe;
 	// these are for interpolation
@@ -341,7 +341,7 @@ typedef struct entity_render_s
 	float transparent_offset;
 
 	// NULL = no model
-	dp_model_t *model;
+	model_t *model;
 	// number of the entity represents, or 0 for non-network entities
 	int entitynumber;
 	// literal colormap colors for renderer, if both are 0 0 0 it is not colormapped
@@ -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;
@@ -611,7 +577,7 @@ typedef struct client_static_s
 	int demonum;
 	// list of demos in loop
 	char demos[MAX_DEMOS][MAX_DEMONAME];
-	// the actively playing demo (set by CL_PlayDemo_f)
+	// the actively playing demo (set by CL_PlayDemo)
 	char demoname[MAX_QPATH];
 
 // demo recording info must be here, because record is started before
@@ -904,7 +870,12 @@ typedef struct client_state_s
 	// how long it has been since the previous client frame in real time
 	// (not game time, for that use cl.time - cl.oldtime)
 	double realframetime;
-	
+
+	// used by cl_nettimesyncboundmode 7
+#define NUM_TS_ERRORS 32 // max 256
+	unsigned char ts_error_num;
+	float ts_error_stor[NUM_TS_ERRORS];
+
 	// fade var for fading while dead
 	float deathfade;
 
@@ -944,10 +915,10 @@ typedef struct client_state_s
 	int gametype;
 
 	// models and sounds used by engine code (particularly cl_parse.c)
-	dp_model_t *model_bolt;
-	dp_model_t *model_bolt2;
-	dp_model_t *model_bolt3;
-	dp_model_t *model_beam;
+	model_t *model_bolt;
+	model_t *model_bolt2;
+	model_t *model_bolt3;
+	model_t *model_beam;
 	sfx_t *sfx_wizhit;
 	sfx_t *sfx_knighthit;
 	sfx_t *sfx_tink1;
@@ -1075,8 +1046,8 @@ typedef struct client_state_s
 	// use cl.scores[cl.playerentity-1].qw_spectator instead
 	//qbool qw_spectator;
 
-	// last time an input packet was sent
-	double lastpackettime;
+	// time accumulated since an input packet was sent
+	float timesincepacket;
 
 	// movement parameters for client prediction
 	unsigned int moveflags;
@@ -1248,9 +1219,11 @@ double CL_Frame(double time);
 void CL_Shutdown (void);
 void CL_Init (void);
 
+void CL_StartVideo(void);
+
 void CL_EstablishConnection(const char *host, int firstarg);
 
-void CL_Disconnect (void);
+void CL_Disconnect (qbool kicked, const char *reason, ... );
 void CL_Disconnect_f(cmd_state_t *cmd);
 
 void CL_UpdateRenderEntity(entity_render_t *ent);
@@ -1278,7 +1251,7 @@ void CL_ValidateState(entity_state_t *s);
 void CL_MoveLerpEntityStates(entity_t *ent);
 void CL_LerpUpdate(entity_t *e);
 void CL_ParseTEnt (void);
-void CL_NewBeam (int ent, vec3_t start, vec3_t end, dp_model_t *m, int lightning);
+void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning);
 void CL_RelinkBeams (void);
 void CL_Beam_CalculatePositions (const beam_t *b, vec3_t start, vec3_t end);
 void CL_ClientMovement_Replay(void);
@@ -1286,7 +1259,7 @@ void CL_ClientMovement_Replay(void);
 void CL_ClearTempEntities (void);
 entity_render_t *CL_NewTempEntity (double shadertime);
 
-void CL_Effect(vec3_t org, dp_model_t *model, int startframe, int framecount, float framerate);
+void CL_Effect(vec3_t org, model_t *model, int startframe, int framecount, float framerate);
 
 void CL_ClearState (void);
 void CL_ExpandEntities(int num);
@@ -1326,6 +1299,7 @@ void CL_WriteDemoMessage(sizebuf_t *mesage);
 void CL_CutDemo(unsigned char **buf, fs_offset_t *filesize);
 void CL_PasteDemo(unsigned char **buf, fs_offset_t *filesize);
 
+void CL_PlayDemo(const char *demo);
 void CL_NextDemo(void);
 void CL_Stop_f(cmd_state_t *cmd);
 void CL_Record_f(cmd_state_t *cmd);
@@ -1385,7 +1359,7 @@ typedef enum meshname_e {
 	NUM_MESHENTITIES,
 } meshname_t;
 extern entity_t cl_meshentities[NUM_MESHENTITIES];
-extern dp_model_t cl_meshentitymodels[NUM_MESHENTITIES];
+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])