X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=server.h;h=b8339b2eff4789e17cf29a1227c1061ec9722ce2;hb=30765cee4b9bb4f0e189023788088d48a9bed7a0;hp=db72d41dd32cb223e7ef9d244d1d2ed0e5a0a819;hpb=728e717bdc878f4ef2fb4311619b232949fb16aa;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index db72d41d..b8339b2e 100644
--- a/server.h
+++ b/server.h
@@ -53,7 +53,6 @@ typedef struct server_static_s
 	unsigned char *csqc_progdata;
 	size_t csqc_progsize_deflated;
 	unsigned char *csqc_progdata_deflated;
-
 } server_static_t;
 
 //=============================================================================
@@ -164,7 +163,7 @@ typedef struct server_s
 	unsigned char csqcentityversion[MAX_EDICTS]; // legacy
 } server_t;
 
-#define NUM_CSQCENTITIES_PER_FRAME 1024
+#define NUM_CSQCENTITIES_PER_FRAME 256
 typedef struct csqcentityframedb_s
 {
 	int framenum;
@@ -229,7 +228,7 @@ typedef struct client_s
 	float spawn_parms[NUM_SPAWN_PARMS];
 
 	// properties that are sent across the network only when changed
-	char name[64], old_name[64];
+	char name[MAX_SCOREBOARDNAME], old_name[MAX_SCOREBOARDNAME];
 	int colors, old_colors;
 	int frags, old_frags;
 	char playermodel[MAX_QPATH], old_model[MAX_QPATH];
@@ -248,10 +247,11 @@ typedef struct client_s
 	unsigned char csqcentityscope[MAX_EDICTS];
 	unsigned int csqcentitysendflags[MAX_EDICTS];
 
-#define NUM_CSQCENTITYDB_FRAMES 64
+#define NUM_CSQCENTITYDB_FRAMES 256
 	unsigned char csqcentityglobalhistory[MAX_EDICTS]; // set to 1 if the entity was ever csqc networked to the client, and never reset back to 0
 	csqcentityframedb_t csqcentityframehistory[NUM_CSQCENTITYDB_FRAMES];
 	int csqcentityframehistory_next;
+	int csqcentityframe_lastreset;
 
 	/// prevent animated names
 	float nametime;
@@ -330,6 +330,7 @@ typedef struct client_s
 #define	SOLID_PHYSICS_BOX		32		///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
 #define	SOLID_PHYSICS_SPHERE	33		///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
 #define	SOLID_PHYSICS_CAPSULE	34		///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
+#define	SOLID_PHYSICS_TRIMESH	35		///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
 
 // edict->deadflag values
 #define	DEAD_NO					0
@@ -393,6 +394,8 @@ extern cvar_t sv_maxairstrafespeed;
 extern cvar_t sv_airstrafeaccel_qw;
 extern cvar_t sv_aircontrol;
 extern cvar_t sv_aircontrol_power;
+extern cvar_t sv_aircontrol_penalty;
+extern cvar_t sv_airspeedlimit_nonqw;
 extern cvar_t sv_allowdownloads;
 extern cvar_t sv_allowdownloads_archive;
 extern cvar_t sv_allowdownloads_config;
@@ -429,21 +432,24 @@ extern cvar_t sv_gameplayfix_droptofloorstartsolid_nudgetocorrect;
 extern cvar_t sv_gameplayfix_easierwaterjump;
 extern cvar_t sv_gameplayfix_findradiusdistancetobox;
 extern cvar_t sv_gameplayfix_gravityunaffectedbyticrate;
-extern cvar_t sv_gameplayfix_nogravityonground;
 extern cvar_t sv_gameplayfix_grenadebouncedownslopes;
 extern cvar_t sv_gameplayfix_multiplethinksperframe;
 extern cvar_t sv_gameplayfix_noairborncorpse;
 extern cvar_t sv_gameplayfix_noairborncorpse_allowsuspendeditems;
 extern cvar_t sv_gameplayfix_nudgeoutofsolid;
-extern cvar_t sv_gameplayfix_nudgeoutofsolid_bias;
+extern cvar_t sv_gameplayfix_nudgeoutofsolid_separation;
+extern cvar_t sv_gameplayfix_q2airaccelerate;
+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;
 extern cvar_t sv_gameplayfix_upwardvelocityclearsongroundflag;
 extern cvar_t sv_gameplayfix_downtracesupportsongroundflag;
+extern cvar_t sv_gameplayfix_q1bsptracelinereportstexture;
 extern cvar_t sv_gravity;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_jumpstep;
@@ -485,7 +491,7 @@ void SV_Init (void);
 
 void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count);
 void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, int framerate);
-void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int volume, float attenuation);
+void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int volume, float attenuation, qboolean reliable);
 void SV_StartPointSound (vec3_t origin, const char *sample, int volume, float attenuation);
 
 void SV_ConnectClient (int clientnum, netconn_t *netconnection);