X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=0dfaf0342255f5ba4f567576026d81f17b85849e;hb=a0465ad2ee16719587b0b7a80d4c1c2f7df1ac0e;hp=761321d7a638f9960dd29af93b20463d79576630;hpb=ef9d51a3182663ae22064b8cf91276aaf50c0129;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index 761321d7..0dfaf034 100644
--- a/server.h
+++ b/server.h
@@ -191,14 +191,21 @@ typedef struct client_s
 	qboolean active;
 	/// false = don't do ClientDisconnect on drop
 	qboolean clientconnectcalled;
-	/// false = don't send datagrams
+	/// false = don't allow spawn
+	qboolean prespawned;
+	/// false = don't allow begin
 	qboolean spawned;
+	/// false = don't send datagrams
+	qboolean begun;
 	/// 1 = send svc_serverinfo and advance to 2, 2 doesn't send, then advances to 0 (allowing unlimited sending) when prespawn is received
 	int sendsignon;
 
 	/// requested rate in bytes per second
 	int rate;
 
+	/// temporarily exceed rate by this amount of bytes
+	int rate_burstsize;
+
 	/// realtime this client connected
 	double connecttime;
 
@@ -458,7 +465,6 @@ extern cvar_t sv_gameplayfix_nogravityonground;
 extern cvar_t sv_gameplayfix_setmodelrealbox;
 extern cvar_t sv_gameplayfix_slidemoveprojectiles;
 extern cvar_t sv_gameplayfix_stepdown;
-extern cvar_t sv_gameplayfix_stepwhilejumping;
 extern cvar_t sv_gameplayfix_stepmultipletimes;
 extern cvar_t sv_gameplayfix_nostepmoveonsteepslopes;
 extern cvar_t sv_gameplayfix_swiminbmodels;
@@ -563,6 +569,10 @@ void SV_LinkEdict_TouchAreaGrid_Call(prvm_edict_t *touch, prvm_edict_t *ent); //
  * returns true if it found a better place
  */
 qboolean SV_UnstickEntity (prvm_edict_t *ent);
+/*! move an entity that is stuck out of the surface it is stuck in (can move large amounts)
+ * returns true if it found a better place
+ */
+qboolean SV_NudgeOutOfSolid(prvm_edict_t *ent);
 
 /// calculates hitsupercontentsmask for a generic qc entity
 int SV_GenericHitSuperContentsMask(const prvm_edict_t *edict);