X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=server.h;h=5ae7befde0f911157127168a7305f1f8d6db6a0d;hb=264666d8dd5ef7eec1acaafb211d7516e2eadae1;hp=9a9a6d9b4ffb9c4b80e4b5959d5878c00d623e0c;hpb=bdd9b654e182e6c122c0107750a7a95f2f33351b;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index 9a9a6d9b..5ae7befd 100644
--- a/server.h
+++ b/server.h
@@ -179,9 +179,6 @@ typedef struct csqcentityframedb_s
 	int sendflags[NUM_CSQCENTITIES_PER_FRAME];
 } csqcentityframedb_t;
 
-// if defined this does ping smoothing, otherwise it does not
-//#define NUM_PING_TIMES 16
-
 #define NUM_SPAWN_PARMS 16
 
 typedef struct client_s
@@ -225,11 +222,6 @@ typedef struct client_s
 	/// PRVM_EDICT_NUM(clientnum+1)
 	prvm_edict_t *edict;
 
-#ifdef NUM_PING_TIMES
-	float ping_times[NUM_PING_TIMES];
-	/// ping_times[num_pings%NUM_PING_TIMES]
-	int num_pings;
-#endif
 	/// LadyHavoc: can be used for prediction or whatever...
 	float ping;
 
@@ -523,7 +515,7 @@ void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int v
 void SV_StartPointSound (vec3_t origin, const char *sample, int volume, float attenuation, float speed);
 
 void SV_ConnectClient (int clientnum, netconn_t *netconnection);
-void SV_DropClient (qbool crash);
+void SV_DropClient (qbool leaving, const char *reason, ... );
 
 void SV_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
 
@@ -589,7 +581,7 @@ int SV_EntitiesInBox(const vec3_t mins, const vec3_t maxs, int maxedicts, prvm_e
 
 qbool SV_CanSeeBox(int numsamples, vec_t eyejitter, vec_t enlarge, vec_t entboxexpand, vec3_t eye, vec3_t entboxmins, vec3_t entboxmaxs);
 
-void SV_MarkWriteEntityStateToClient(entity_state_t *s);
+void SV_MarkWriteEntityStateToClient(entity_state_t *s, client_t *client);
 
 void SV_SendServerinfo(client_t *client);
 void SV_WriteEntitiesToClient(client_t *client, prvm_edict_t *clent, sizebuf_t *msg, int maxsize);
@@ -611,7 +603,7 @@ void SV_CheckVelocity (prvm_edict_t *ent);
 
 void SV_SetupVM(void);
 
-const char *Host_TimingReport(char *buf, size_t buflen); ///< for output in SV_Status_f
+const char *SV_TimingReport(char *buf, size_t buflen); ///< for output in SV_Status_f
 
 int SV_GetPitchSign(prvm_prog_t *prog, prvm_edict_t *ent);
 void SV_GetEntityMatrix(prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, qbool viewmatrix);