X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=c6ec424e14f83f91376b5f9d6c971aca8926180d;hb=a49bfc10adaa500e285c04d76857b96c937536b3;hp=231702c04740d1e8c249e6184e2ec7394276b10b;hpb=8085fb469a8551e2baf9d437ff809620f6f4f08d;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index 231702c0..c6ec424e 100644 --- a/server.h +++ b/server.h @@ -48,9 +48,10 @@ typedef struct qboolean loadgame; // one of the PROTOCOL_ values - int protocol; - // this disables extensions when using PROTOCOL_QUAKE - qboolean netquakecompatible; + protocolversion_t protocol; + + // used for running multiple steps in one frame, etc + double timer; double time; @@ -66,25 +67,18 @@ typedef struct char modelname[64]; struct model_s *worldmodel; // NULL terminated - char *model_precache[MAX_MODELS]; + // LordHavoc: precaches are now MAX_QPATH rather than a pointer + // updated by SV_ModelIndex + char model_precache[MAX_MODELS][MAX_QPATH]; struct model_s *models[MAX_MODELS]; // NULL terminated - char *sound_precache[MAX_SOUNDS]; - char *lightstyles[MAX_LIGHTSTYLES]; - int num_edicts; - int max_edicts; - // small edict_t structures which just contain pointers - // (allocated at server startup only) - edict_t *edicts; - // engine private edict information - // (dynamically resized - always access through edict_t!) - edict_engineprivate_t *edictsengineprivate; - // QuakeC fields array - // (dynamically resized - always access through edict_t!) - void *edictsfields; + // LordHavoc: precaches are now MAX_QPATH rather than a pointer + // 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) - edict_t **moved_edicts; + prvm_edict_t **moved_edicts; // some actions are only valid during load server_state_t state; @@ -100,22 +94,23 @@ typedef struct qbyte signon_buf[NET_MAXMESSAGE]; } server_t; +// if defined this does ping smoothing, otherwise it does not +//#define NUM_PING_TIMES 16 -#define NUM_PING_TIMES 16 #define NUM_SPAWN_PARMS 16 typedef struct client_s { // false = empty client slot qboolean active; + // false = don't do ClientDisconnect on drop + 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; - // remove this client immediately - qboolean deadsocket; // requested rate in bytes per second int rate; @@ -129,6 +124,7 @@ typedef struct client_s // communications handle netconn_t *netconnection; + int movesequence; // movement usercmd_t cmd; // intended motion calced from cmd @@ -137,12 +133,14 @@ typedef struct client_s // can be added to at any time, copied and clear once per frame sizebuf_t message; qbyte msgbuf[NET_MAXMESSAGE]; - // EDICT_NUM(clientnum+1) - edict_t *edict; + // PRVM_EDICT_NUM(clientnum+1) + prvm_edict_t *edict; +#ifdef NUM_PING_TIMES float ping_times[NUM_PING_TIMES]; // ping_times[num_pings%NUM_PING_TIMES] int num_pings; +#endif // LordHavoc: can be used for prediction or whatever... float ping; @@ -153,6 +151,8 @@ typedef struct client_s char name[64], old_name[64]; int colors, old_colors; int frags, old_frags; + char playermodel[MAX_QPATH], old_model[MAX_QPATH]; + char playerskin[MAX_QPATH], old_skin[MAX_QPATH]; // visibility state float visibletime[MAX_EDICTS]; @@ -160,6 +160,9 @@ typedef struct client_s // prevent animated names float nametime; + // latest received clc_ackframe (used to detect packet loss) + int latestframenum; + entityframe_database_t *entitydatabase; entityframe4_database_t *entitydatabase4; entityframe5_database_t *entitydatabase5; @@ -264,9 +267,11 @@ extern cvar_t sv_gameplayfix_noairborncorpse; 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 mempool_t *sv_clients_mempool; -extern mempool_t *sv_edicts_mempool; +extern mempool_t *sv_mempool; // persistant server info extern server_static_t svs; @@ -275,15 +280,13 @@ extern server_t sv; extern client_t *host_client; -extern jmp_buf host_abortserver; - //=========================================================== 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 (edict_t *entity, int channel, char *sample, int volume, float attenuation); +void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int volume, float attenuation); void SV_ConnectClient (int clientnum, netconn_t *netconnection); void SV_DropClient (qboolean crash); @@ -293,7 +296,12 @@ void SV_ClearDatagram (void); void SV_ReadClientMessage(void); -int SV_ModelIndex (const char *name); +// precachemode values: +// 0 = fail if not precached, +// 1 = warn if not found and precache if possible +// 2 = precache +int SV_ModelIndex(const char *s, int precachemode); +int SV_SoundIndex(const char *s, int precachemode); void SV_SetIdealPitch (void); @@ -308,19 +316,24 @@ void SV_BroadcastPrintf(const char *fmt, ...); void SV_Physics (void); -qboolean SV_PlayerCheckGround (edict_t *ent); -qboolean SV_CheckBottom (edict_t *ent); -qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink); +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); -void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg); +void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats); void SV_MoveToGoal (void); -void SV_RunClients (void); +void SV_ApplyClientMove (void); void SV_SaveSpawnparms (void); void SV_SpawnServer (const char *server); -void SV_CheckVelocity (edict_t *ent); +void SV_CheckVelocity (prvm_edict_t *ent); + +void SV_SetupVM(void); + +void SV_VM_Begin(void); +void SV_VM_End(void); #endif