X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=dff58cac4c8a503441191e46052db61029655a86;hb=7af96fa3f500f70e1869316d201cdc4d31fbb75f;hp=8371c750b9fc420014124526c2038fa208276ce8;hpb=6162f7035eef9d1dc6a4913dba2e2023c0857c3a;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index 8371c750..dff58cac 100644
--- a/server.h
+++ b/server.h
@@ -40,6 +40,14 @@ typedef struct server_static_s
 
 typedef enum server_state_e {ss_loading, ss_active} server_state_t;
 
+#define MAX_CONNECTFLOODADDRESSES 16
+typedef struct server_connectfloodaddress_s
+{
+	double lasttime;
+	lhnetaddress_t address;
+}
+server_connectfloodaddress_t;
+
 typedef struct server_s
 {
 	// false if only a net client
@@ -60,6 +68,14 @@ typedef struct server_s
 	int lastcheck;
 	double lastchecktime;
 
+	// crc of clientside progs at time of level start
+	int csqc_progcrc; // -1 = no progs
+	int csqc_progsize; // -1 = no progs
+	char csqc_progname[MAX_QPATH]; // copied from csqc_progname at level start
+
+	// collision culling data
+	world_t world;
+
 	// map name
 	char name[64];
 	// maps/<name>.bsp, for model_precache[0]
@@ -91,6 +107,15 @@ typedef struct server_s
 	sizebuf_t signon;
 	// LordHavoc: increased signon message buffer from 8192
 	unsigned char signon_buf[NET_MAXMESSAGE];
+
+	// connection flood blocking
+	// note this is in server_t rather than server_static_t so that it is
+	// reset on each map command (such as New Game in singleplayer)
+	server_connectfloodaddress_t connectfloodaddresses[MAX_CONNECTFLOODADDRESSES];
+
+#define SV_MAX_PARTICLEEFFECTNAME 256
+	qboolean particleeffectnamesloaded;
+	char particleeffectname[SV_MAX_PARTICLEEFFECTNAME][MAX_QPATH];
 } server_t;
 
 // if defined this does ping smoothing, otherwise it does not
@@ -135,7 +160,7 @@ typedef struct client_s
 #endif
 	// LordHavoc: can be used for prediction or whatever...
 	float ping;
-	
+
 	// this is used by sv_clmovement_minping code
 	double clmovement_disabletimeout;
 	// this is used by sv_clmvoement_waitforinput code
@@ -167,6 +192,12 @@ typedef struct client_s
 	entityframe_database_t *entitydatabase;
 	entityframe4_database_t *entitydatabase4;
 	entityframe5_database_t *entitydatabase5;
+
+	// information on an active download if any
+	qfile_t *download_file;
+	int download_expectedposition; // next position the client should ack
+	qboolean download_started;
+	char download_name[MAX_QPATH];
 } client_t;
 
 
@@ -275,6 +306,8 @@ extern cvar_t sv_gameplayfix_setmodelrealbox;
 extern cvar_t sv_gameplayfix_blowupfallenzombies;
 extern cvar_t sv_gameplayfix_findradiusdistancetobox;
 extern cvar_t sv_gameplayfix_qwplayerphysics;
+extern cvar_t sv_gameplayfix_upwardvelocityclearsongroundflag;
+extern cvar_t sv_gameplayfix_droptofloorstartsolid;
 
 extern cvar_t sys_ticrate;
 extern cvar_t sv_fixedframeratesingleplayer;
@@ -311,6 +344,8 @@ void SV_ReadClientMessage(void);
 int SV_ModelIndex(const char *s, int precachemode);
 int SV_SoundIndex(const char *s, int precachemode);
 
+int SV_ParticleEffectIndex(const char *name);
+
 void SV_SetIdealPitch (void);
 
 void SV_AddUpdates (void);
@@ -318,18 +353,28 @@ void SV_AddUpdates (void);
 void SV_ClientThink (void);
 
 void SV_ClientPrint(const char *msg);
-void SV_ClientPrintf(const char *fmt, ...);
+void SV_ClientPrintf(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void SV_BroadcastPrint(const char *msg);
-void SV_BroadcastPrintf(const char *fmt, ...);
+void SV_BroadcastPrintf(const char *fmt, ...) DP_FUNC_PRINTF(1);
 
 void SV_Physics (void);
 void SV_Physics_ClientEntity (prvm_edict_t *ent);
 
 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);
+qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink, qboolean noenemy, qboolean settrace);
+
+// Needs to be called any time an entity changes origin, mins, maxs, or solid
+// sets ent->v.absmin and ent->v.absmax
+// if touchtriggers, calls prog functions for the intersected triggers
+void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers);
+
+// calculates hitsupercontentsmask for a generic qc entity
+int SV_GenericHitSuperContentsMask(const prvm_edict_t *edict);
+// traces a box move against worldmodel and all entities in the specified area
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask);
 
-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);
+#define SV_PointSuperContents(point) (SV_Move((point), vec3_origin, vec3_origin, (point), sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL, 0).startsupercontents)
 
 void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats);