X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=server.h;h=99c5296d263be02a4519cf44a195623191f8cc3a;hp=41947092940a0e0a8804978cc23c83468f0c58df;hb=c3ea7019c9ce6dd91e6f40a027a45cd27da17385;hpb=a19dce25671ecfa28e4eb3861f8636750bf3ba68 diff --git a/server.h b/server.h index 41947092..99c5296d 100644 --- a/server.h +++ b/server.h @@ -34,6 +34,20 @@ typedef struct server_static_s qboolean changelevel_issued; // server infostring char serverinfo[MAX_SERVERINFO_STRING]; + // performance data + float perf_cpuload; + float perf_lost; + float perf_offset_avg; + float perf_offset_max; + float perf_offset_sdev; + // temporary performance data accumulators + float perf_acc_realtime; + float perf_acc_sleeptime; + float perf_acc_lost; + float perf_acc_offset; + float perf_acc_offset_squared; + float perf_acc_offset_max; + int perf_acc_offset_samples; } server_static_t; //============================================================================= @@ -54,6 +68,7 @@ typedef struct server_s qboolean active; qboolean paused; + double pausedstart; // handle connections specially qboolean loadgame; @@ -70,7 +85,14 @@ typedef struct server_s // 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 + unsigned char *csqc_progdata; + size_t csqc_progsize_deflated; + unsigned char *csqc_progdata_deflated; + + // collision culling data + world_t world; // map name char name[64]; @@ -87,9 +109,6 @@ typedef struct server_s // updated by SV_SoundIndex char sound_precache[MAX_SOUNDS][MAX_QPATH]; char lightstyles[MAX_LIGHTSTYLES][64]; - // PushMove sometimes has to move entities back from a failed move - // (dynamically resized) - prvm_edict_t **moved_edicts; // some actions are only valid during load server_state_t state; @@ -108,8 +127,44 @@ typedef struct server_s // 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]; + + int writeentitiestoclient_stats_culled_pvs; + int writeentitiestoclient_stats_culled_trace; + int writeentitiestoclient_stats_visibleentities; + int writeentitiestoclient_stats_totalentities; + int writeentitiestoclient_cliententitynumber; + int writeentitiestoclient_clientnumber; + sizebuf_t *writeentitiestoclient_msg; + vec3_t writeentitiestoclient_testeye; + int writeentitiestoclient_pvsbytes; + unsigned char writeentitiestoclient_pvs[MAX_MAP_LEAFS/8]; + entity_state_t writeentitiestoclient_sendstates[MAX_EDICTS]; + + int numsendentities; + entity_state_t sendentities[MAX_EDICTS]; + entity_state_t *sendentitiesindex[MAX_EDICTS]; + + int sententitiesmark; + int sententities[MAX_EDICTS]; + int sententitiesconsideration[MAX_EDICTS]; + + // legacy support for self.Version based csqc entity networking + unsigned char csqcentityversion[MAX_EDICTS]; // legacy } server_t; +#define NUM_CSQCENTITIES_PER_FRAME 1024 +typedef struct csqcentityframedb_s +{ + int framenum; + int num; + unsigned short entno[NUM_CSQCENTITIES_PER_FRAME]; + int sendflags[NUM_CSQCENTITIES_PER_FRAME]; +} csqcentityframedb_t; + // if defined this does ping smoothing, otherwise it does not //#define NUM_PING_TIMES 16 @@ -123,6 +178,8 @@ typedef struct client_s qboolean clientconnectcalled; // false = don't send datagrams qboolean spawned; + // 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; @@ -168,9 +225,24 @@ 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]; + // scope is whether an entity is currently being networked to this client + // sendflags is what properties have changed on the entity since the last + // update that was sent + int csqcnumedicts; + unsigned char csqcentityscope[MAX_EDICTS]; + unsigned int csqcentitysendflags[MAX_EDICTS]; + +#define NUM_CSQCENTITYDB_FRAMES 64 + 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; + // prevent animated names float nametime; @@ -181,9 +253,35 @@ typedef struct client_s char weaponmodel[MAX_QPATH]; int weaponmodelindex; + // clientcamera (entity to use as camera) + int clientcamera; + 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]; + qboolean download_deflate; + + // fixangle data + qboolean fixangle_angles_set; + vec3_t fixangle_angles; + + // demo recording + qfile_t *sv_demo_file; } client_t; @@ -238,18 +336,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 @@ -257,45 +343,99 @@ typedef struct client_s //============================================================================ -extern cvar_t teamplay; -extern cvar_t skill; -extern cvar_t deathmatch; extern cvar_t coop; +extern cvar_t deathmatch; extern cvar_t fraglimit; -extern cvar_t timelimit; +extern cvar_t gamecfg; +extern cvar_t noexit; +extern cvar_t nomonsters; extern cvar_t pausable; -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 pr_checkextension; +extern cvar_t samelevel; +extern cvar_t saved1; +extern cvar_t saved2; +extern cvar_t saved3; +extern cvar_t saved4; +extern cvar_t savedgamecfg; +extern cvar_t scratch1; +extern cvar_t scratch2; +extern cvar_t scratch3; +extern cvar_t scratch4; +extern cvar_t skill; +extern cvar_t slowmo; 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; -extern cvar_t sv_jumpstep; -extern cvar_t sv_public; -extern cvar_t sv_maxrate; - +extern cvar_t sv_airaccel_qw; +extern cvar_t sv_airaccel_sideways_friction; +extern cvar_t sv_airaccelerate; +extern cvar_t sv_allowdownloads; +extern cvar_t sv_allowdownloads_archive; +extern cvar_t sv_allowdownloads_config; +extern cvar_t sv_allowdownloads_dlcache; +extern cvar_t sv_allowdownloads_inarchive; +extern cvar_t sv_areagrid_mingridsize; +extern cvar_t sv_checkforpacketsduringsleep; +extern cvar_t sv_clmovement_enable; +extern cvar_t sv_clmovement_minping; +extern cvar_t sv_clmovement_minping_disabletime; +extern cvar_t sv_clmovement_waitforinput; +extern cvar_t sv_cullentities_nevercullbmodels; +extern cvar_t sv_cullentities_pvs; +extern cvar_t sv_cullentities_stats; +extern cvar_t sv_cullentities_trace; +extern cvar_t sv_cullentities_trace_delay; +extern cvar_t sv_cullentities_trace_enlarge; +extern cvar_t sv_cullentities_trace_prediction; +extern cvar_t sv_cullentities_trace_samples; +extern cvar_t sv_cullentities_trace_samples_extra; +extern cvar_t sv_debugmove; +extern cvar_t sv_echobprint; +extern cvar_t sv_edgefriction; +extern cvar_t sv_entpatch; +extern cvar_t sv_fixedframeratesingleplayer; +extern cvar_t sv_freezenonclients; +extern cvar_t sv_friction; +extern cvar_t sv_gameplayfix_blowupfallenzombies; +extern cvar_t sv_gameplayfix_delayprojectiles; +extern cvar_t sv_gameplayfix_droptofloorstartsolid; +extern cvar_t sv_gameplayfix_droptofloorstartsolid_nudgetocorrect; +extern cvar_t sv_gameplayfix_easierwaterjump; +extern cvar_t sv_gameplayfix_findradiusdistancetobox; extern cvar_t sv_gameplayfix_grenadebouncedownslopes; +extern cvar_t sv_gameplayfix_multiplethinksperframe; extern cvar_t sv_gameplayfix_noairborncorpse; +extern cvar_t sv_gameplayfix_setmodelrealbox; extern cvar_t sv_gameplayfix_stepdown; extern cvar_t sv_gameplayfix_stepwhilejumping; 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_gravityunaffectedbyticrate; +extern cvar_t sv_gravity; +extern cvar_t sv_idealpitchscale; +extern cvar_t sv_jumpstep; +extern cvar_t sv_jumpvelocity; +extern cvar_t sv_maxairspeed; +extern cvar_t sv_maxrate; +extern cvar_t sv_maxspeed; +extern cvar_t sv_maxvelocity; +extern cvar_t sv_newflymove; +extern cvar_t sv_nostep; +extern cvar_t sv_playerphysicsqc; +extern cvar_t sv_progs; +extern cvar_t sv_protocolname; +extern cvar_t sv_random_seed; +extern cvar_t sv_ratelimitlocalplayer; +extern cvar_t sv_sound_land; +extern cvar_t sv_sound_watersplash; +extern cvar_t sv_stepheight; +extern cvar_t sv_stopspeed; +extern cvar_t sv_wallfriction; +extern cvar_t sv_wateraccelerate; +extern cvar_t sv_waterfriction; extern cvar_t sys_ticrate; -extern cvar_t sv_fixedframeratesingleplayer; +extern cvar_t teamplay; +extern cvar_t temp1; +extern cvar_t timelimit; extern mempool_t *sv_mempool; @@ -313,12 +453,12 @@ 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_StartPointSound (vec3_t origin, const char *sample, int volume, float attenuation); 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); @@ -329,6 +469,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); @@ -341,14 +483,30 @@ void SV_BroadcastPrint(const char *msg); 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); -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); +// 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); +// move an entity that is stuck by small amounts in various directions to try to nudge it back into the collision hull +// returns true if it found a better place +qboolean SV_UnstickEntity (prvm_edict_t *ent); + +// 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); + +int SV_PointSuperContents(const vec3_t point); + +void SV_FlushBroadcastMessages(void); void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats); void SV_MoveToGoal (void); @@ -364,5 +522,7 @@ void SV_SetupVM(void); void SV_VM_Begin(void); void SV_VM_End(void); +const char *Host_TimingReport(); // for output in Host_Status_f + #endif