X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=server.h;h=5fbb3f714f02e73027486b48b15f0e18a9996695;hb=018a70ec5e58fead3ddcbd1a4cf63ad2abc3d8f1;hp=4e6635f8110951842b33d2dc7c02eacaadb9c326;hpb=8dcce44300385b12c46d494c06aadcfa35a8bc14;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index 4e6635f8..5fbb3f71 100644
--- a/server.h
+++ b/server.h
@@ -40,6 +40,8 @@ typedef struct
 	qboolean	loadgame;			// handle connections specially
 
 	double		time;
+
+	double		frametime;
 	
 	int			lastcheck;			// used by PF_checkclient
 	double		lastchecktime;
@@ -77,7 +79,6 @@ typedef struct client_s
 	qboolean		active;				// false = client is free
 	qboolean		spawned;			// false = don't send datagrams
 	qboolean		dropasap;			// has been told to go to another level
-	qboolean		privileged;			// can execute any host command
 	qboolean		sendsignon;			// only valid before spawned
 
 	double			last_message;		// reliable messages must be sent
@@ -97,12 +98,18 @@ typedef struct client_s
 		
 	float			ping_times[NUM_PING_TIMES];
 	int				num_pings;			// ping_times[num_pings%NUM_PING_TIMES]
+	float			ping;				// LordHavoc: can be used for prediction or whatever...
+	float			latency;			// LordHavoc: specifically used for prediction, accounts for sys_ticrate too
 
 // spawn parms are carried from level to level
 	float			spawn_parms[NUM_SPAWN_PARMS];
 
 // client known data for deltas	
 	int				old_frags;
+	int				pmodel;
+
+	// delta compression state
+	float			nextfullupdate[MAX_EDICTS];
 } client_t;
 
 
@@ -176,31 +183,42 @@ typedef struct client_s
 
 //============================================================================
 
-extern	cvar_t	teamplay;
-extern	cvar_t	skill;
-extern	cvar_t	deathmatch;
-extern	cvar_t	coop;
-extern	cvar_t	fraglimit;
-extern	cvar_t	timelimit;
-
-extern	server_static_t	svs;				// persistant server info
-extern	server_t		sv;					// local server
-
-extern	client_t	*host_client;
-
-extern	jmp_buf 	host_abortserver;
-
-extern	double		host_time;
-
-extern	edict_t		*sv_player;
+extern cvar_t teamplay;
+extern cvar_t skill;
+extern cvar_t deathmatch;
+extern cvar_t coop;
+extern cvar_t fraglimit;
+extern cvar_t timelimit;
+extern cvar_t pausable;
+extern cvar_t sv_deltacompress;
+extern cvar_t sv_maxvelocity;
+extern cvar_t sv_gravity;
+extern cvar_t sv_nostep;
+extern cvar_t sv_friction;
+extern cvar_t sv_edgefriction;
+extern cvar_t sv_stopspeed;
+extern cvar_t sv_maxspeed;
+extern cvar_t sv_accelerate;
+extern cvar_t sv_idealpitchscale;
+extern cvar_t sv_aim;
+extern cvar_t sv_predict;
+
+extern server_static_t svs;				// persistant server info
+extern server_t sv;					// local server
+
+extern client_t *host_client;
+
+extern jmp_buf host_abortserver;
+
+extern edict_t *sv_player;
 
 //===========================================================
 
 void SV_Init (void);
 
 void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count);
-void SV_StartSound (edict_t *entity, int channel, char *sample, int volume,
-    float attenuation);
+void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, int framerate);
+void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, float attenuation);
 
 void SV_DropClient (qboolean crash);
 
@@ -230,5 +248,5 @@ void SV_MoveToGoal (void);
 
 void SV_CheckForNewClients (void);
 void SV_RunClients (void);
-void SV_SaveSpawnparms ();
+void SV_SaveSpawnparms (void);
 void SV_SpawnServer (char *server);