X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=server.h;h=10047f670d7d67f8e566d4a5ac11d91caaae6d96;hb=7654bd9684b667c0e755205846fbd62948bd1098;hp=c6ec424e14f83f91376b5f9d6c971aca8926180d;hpb=919fbb05eeafd41c867b1f39bb2cc9e5dd61077e;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index c6ec424e..10047f67 100644 --- a/server.h +++ b/server.h @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef SERVER_H #define SERVER_H -typedef struct +typedef struct server_static_s { // number of svs.clients slots (updated by maxplayers command) int maxclients; @@ -32,13 +32,23 @@ typedef struct int serverflags; // cleared when at SV_SpawnServer qboolean changelevel_issued; + // server infostring + char serverinfo[MAX_SERVERINFO_STRING]; } server_static_t; //============================================================================= -typedef enum {ss_loading, ss_active} server_state_t; +typedef enum server_state_e {ss_loading, ss_active} server_state_t; -typedef struct +#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 qboolean active; @@ -50,9 +60,6 @@ typedef struct // one of the PROTOCOL_ values protocolversion_t protocol; - // used for running multiple steps in one frame, etc - double timer; - double time; double frametime; @@ -61,6 +68,10 @@ typedef struct int lastcheck; double lastchecktime; + // crc of clientside progs at time of level start + int csqc_progcrc; // -1 = no progs + char csqc_progname[MAX_QPATH]; // copied from csqc_progname at level start + // map name char name[64]; // maps/.bsp, for model_precache[0] @@ -83,15 +94,20 @@ typedef struct server_state_t state; sizebuf_t datagram; - qbyte datagram_buf[NET_MAXMESSAGE]; + unsigned char datagram_buf[NET_MAXMESSAGE]; // copied to all clients at end of frame sizebuf_t reliable_datagram; - qbyte reliable_datagram_buf[NET_MAXMESSAGE]; + unsigned char reliable_datagram_buf[NET_MAXMESSAGE]; sizebuf_t signon; // LordHavoc: increased signon message buffer from 8192 - qbyte signon_buf[NET_MAXMESSAGE]; + 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]; } server_t; // if defined this does ping smoothing, otherwise it does not @@ -107,10 +123,6 @@ typedef struct client_s qboolean clientconnectcalled; // false = don't send datagrams qboolean spawned; - // has been told to go to another level - qboolean dropasap; - // only valid before spawned - qboolean sendsignon; // requested rate in bytes per second int rate; @@ -118,8 +130,8 @@ typedef struct client_s // realtime this client connected double connecttime; - // reliable messages must be sent periodically - double last_message; + // keepalive messages must be sent periodically during signon + double keepalivetime; // communications handle netconn_t *netconnection; @@ -130,9 +142,6 @@ typedef struct client_s // intended motion calced from cmd vec3_t wishdir; - // can be added to at any time, copied and clear once per frame - sizebuf_t message; - qbyte msgbuf[NET_MAXMESSAGE]; // PRVM_EDICT_NUM(clientnum+1) prvm_edict_t *edict; @@ -144,6 +153,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]; @@ -163,9 +177,19 @@ typedef struct client_s // latest received clc_ackframe (used to detect packet loss) int latestframenum; + // cache weaponmodel name lookups + char weaponmodel[MAX_QPATH]; + int weaponmodelindex; + 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; @@ -246,15 +270,18 @@ extern cvar_t coop; extern cvar_t fraglimit; extern cvar_t timelimit; extern cvar_t pausable; -extern cvar_t sv_deltacompress; 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; @@ -270,6 +297,11 @@ 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 sys_ticrate; +extern cvar_t sv_fixedframeratesingleplayer; extern mempool_t *sv_mempool; @@ -310,16 +342,19 @@ 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); +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);