X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=4105076a1437920a10dc7b623b5286fd0d80e93e;hb=99b0975118f01d84caf24769b8040e5eb44e72a1;hp=34c95851231e536898bc61d7d2f31443c8fe1e21;hpb=a9be87735a48f0cf3ccf143e661f6bd917091730;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index 34c95851..4105076a 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; @@ -192,6 +228,9 @@ 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; @@ -214,6 +253,9 @@ typedef struct client_s // fixangle data qboolean fixangle_angles_set; vec3_t fixangle_angles; + + // demo recording + qfile_t *sv_demo_file; } client_t; @@ -275,49 +317,98 @@ 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_jumpvelocity; +extern cvar_t sv_aim; extern cvar_t sv_airaccel_qw; extern cvar_t sv_airaccel_sideways_friction; -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_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_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; @@ -335,6 +426,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); @@ -376,12 +468,16 @@ qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink, qboolean // 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); -#define SV_PointSuperContents(point) (SV_Move((point), vec3_origin, vec3_origin, (point), sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL, 0).startsupercontents) +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); @@ -399,5 +495,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