X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=server.h;h=ad31f39d23735ec378eb3c1f63ae8651c10177ac;hp=606879b9bc14638084409f86da4ef33cefcaf36f;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hpb=56561de0acdb9cf29d155992440ac3e0d32909dd

diff --git a/server.h b/server.h
index 606879b9..ad31f39d 100644
--- a/server.h
+++ b/server.h
@@ -94,8 +94,9 @@ typedef struct
 	qbyte signon_buf[NET_MAXMESSAGE];
 } server_t;
 
+// if defined this does ping smoothing, otherwise it does not
+//#define NUM_PING_TIMES 16
 
-#define NUM_PING_TIMES 16
 #define NUM_SPAWN_PARMS 16
 
 typedef struct client_s
@@ -135,9 +136,11 @@ 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
 	// LordHavoc: can be used for prediction or whatever...
 	float ping;
 
@@ -251,6 +254,7 @@ extern cvar_t sv_friction;
 extern cvar_t sv_edgefriction;
 extern cvar_t sv_stopspeed;
 extern cvar_t sv_maxspeed;
+extern cvar_t sv_maxairspeed;
 extern cvar_t sv_accelerate;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;
@@ -317,6 +321,8 @@ qboolean SV_PlayerCheckGround (prvm_edict_t *ent);
 qboolean SV_CheckBottom (prvm_edict_t *ent);
 qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink);
 
+struct trace_s SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents);
+
 void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats);
 
 void SV_MoveToGoal (void);