X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=3e9b71191bd696b8eafa086ed032a70c67ceb3e0;hb=eb529936e63194bad80c9a4896a85a7a2e3610c6;hp=36593280c2c26cd6770b71ef638a167452a34b46;hpb=21ded8df6a28011633098ac23f92cd5a7f8250bc;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index 36593280..3e9b7119 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; //============================================================================= @@ -91,9 +105,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; @@ -116,6 +127,26 @@ typedef struct server_s #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]; } server_t; // if defined this does ping smoothing, otherwise it does not @@ -131,6 +162,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; @@ -182,6 +215,9 @@ typedef struct client_s // visibility state float visibletime[MAX_EDICTS]; + // version number of csqc-based entity to decide whether to send it + unsigned char csqcentityversion[MAX_EDICTS]; + // prevent animated names float nametime; @@ -214,6 +250,9 @@ typedef struct client_s // fixangle data qboolean fixangle_angles_set; vec3_t fixangle_angles; + + // demo recording + qfile_t *sv_demo_file; } client_t; @@ -268,18 +307,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 @@ -287,46 +314,97 @@ 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_findradiusdistancetobox; extern cvar_t sv_gameplayfix_grenadebouncedownslopes; +extern cvar_t sv_gameplayfix_multiplethinksperframe; extern cvar_t sv_gameplayfix_noairborncorpse; +extern cvar_t sv_gameplayfix_qwplayerphysics; +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_droptofloorstartsolid; - +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; @@ -344,6 +422,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_StartPointSound (vec3_t origin, const char *sample, int volume, float attenuation); void SV_ConnectClient (int clientnum, netconn_t *netconnection); void SV_DropClient (qboolean crash); @@ -408,5 +487,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