X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=server.h;h=0eda63321086ed639e690a0b8fa54641b106e739;hp=aab7353205f216b3cade969399034b38fb9fe04e;hb=76ed5d5ee3a2517bfae3df09fb0b8d912f7286bc;hpb=b84125ed0d5fc6922a9ea18b7762b489e377175d diff --git a/server.h b/server.h index aab73532..0eda6332 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 @@ -52,9 +60,6 @@ typedef struct server_s // one of the PROTOCOL_ values protocolversion_t protocol; - // used for running multiple steps in one frame, etc - double timer; - double time; double frametime; @@ -63,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/.bsp, for model_precache[0] @@ -94,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 @@ -139,6 +161,11 @@ typedef struct client_s // 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 + int clmovement_skipphysicsframes; + // spawn parms are carried from level to level float spawn_parms[NUM_SPAWN_PARMS]; @@ -149,6 +176,9 @@ typedef struct client_s char playermodel[MAX_QPATH], old_model[MAX_QPATH]; char playerskin[MAX_QPATH], old_skin[MAX_QPATH]; + // netaddress support + char netaddress[MAX_QPATH]; + // visibility state float visibletime[MAX_EDICTS]; @@ -165,6 +195,25 @@ typedef struct client_s entityframe_database_t *entitydatabase; entityframe4_database_t *entitydatabase4; entityframe5_database_t *entitydatabase5; + + // delta compression of stats + unsigned char statsdeltabits[(MAX_CL_STATS+7)/8]; + int stats[MAX_CL_STATS]; + + unsigned char unreliablemsg_data[NET_MAXMESSAGE]; + sizebuf_t unreliablemsg; + int unreliablemsg_splitpoints; + int unreliablemsg_splitpoint[NET_MAXMESSAGE/16]; + + // 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]; + + // fixangle data + qboolean fixangle_angles_set; + vec3_t fixangle_angles; } client_t; @@ -219,18 +268,6 @@ typedef struct client_s #define FL_WATERJUMP 2048 // player jumping out of water #define FL_JUMPRELEASED 4096 // for jump debouncing -// entity effects - -#define EF_BRIGHTFIELD 1 -#define EF_MUZZLEFLASH 2 -#define EF_BRIGHTLIGHT 4 -#define EF_DIMLIGHT 8 -// added EF_ effects: -#define EF_NODRAW 16 -#define EF_ADDITIVE 32 // LordHavoc: Additive Rendering -#define EF_BLUE 64 -#define EF_RED 128 - #define SPAWNFLAG_NOT_EASY 256 #define SPAWNFLAG_NOT_MEDIUM 512 #define SPAWNFLAG_NOT_HARD 1024 @@ -249,11 +286,14 @@ extern cvar_t sv_maxvelocity; extern cvar_t sv_gravity; extern cvar_t sv_nostep; extern cvar_t sv_friction; +extern cvar_t sv_waterfriction; 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_airaccelerate; +extern cvar_t sv_wateraccelerate; extern cvar_t sv_idealpitchscale; extern cvar_t sv_aim; extern cvar_t sv_stepheight; @@ -269,6 +309,9 @@ extern cvar_t sv_gameplayfix_swiminbmodels; 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; @@ -294,7 +337,6 @@ void SV_ConnectClient (int clientnum, netconn_t *netconnection); void SV_DropClient (qboolean crash); void SV_SendClientMessages (void); -void SV_ClearDatagram (void); void SV_ReadClientMessage(void); @@ -305,6 +347,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); @@ -312,19 +356,31 @@ 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_ClientMove (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_FlushBroadcastMessages(void); void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats); void SV_MoveToGoal (void);