X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=70a8348b949cc30899e83c7f6537994dc2b1fd1e;hb=3925160639fbd76eceb05d78a8b8667d066111d5;hp=490dd52c648080a5d17e7be2f6359cd7fb9a8eb0;hpb=8da4459b59336acc54dd028e44177756cbfa48cd;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index 490dd52c..70a8348b 100644 --- a/server.h +++ b/server.h @@ -24,8 +24,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef struct { - // NULL pointers are non-existent clients - struct client_s *connectedclients[MAX_SCOREBOARD]; + // number of svs.clients slots (updated by maxplayers command) + int maxclients; + // client slots + struct client_s *clients; // episode completion information int serverflags; // cleared when at SV_SpawnServer @@ -45,6 +47,14 @@ typedef struct // handle connections specially qboolean loadgame; + // one of the PROTOCOL_ values + int protocol; + // this disables extensions when using PROTOCOL_QUAKE + qboolean netquakecompatible; + + // used for running multiple steps in one frame, etc + double timer; + double time; double frametime; @@ -59,10 +69,14 @@ 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]; + // 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]; int num_edicts; int max_edicts; @@ -82,15 +96,15 @@ typedef struct server_state_t state; sizebuf_t datagram; - qbyte datagram_buf[MAX_DATAGRAM]; + qbyte datagram_buf[NET_MAXMESSAGE]; // copied to all clients at end of frame sizebuf_t reliable_datagram; - qbyte reliable_datagram_buf[MAX_DATAGRAM]; + qbyte reliable_datagram_buf[NET_MAXMESSAGE]; sizebuf_t signon; - // LordHavoc: increased signon message buffer from 8192 to 32768 - qbyte signon_buf[32768]; + // LordHavoc: increased signon message buffer from 8192 + qbyte signon_buf[NET_MAXMESSAGE]; } server_t; @@ -99,6 +113,8 @@ typedef struct typedef struct client_s { + // false = empty client slot + qboolean active; // false = don't send datagrams qboolean spawned; // has been told to go to another level @@ -107,8 +123,12 @@ typedef struct client_s qboolean sendsignon; // remove this client immediately qboolean deadsocket; - // index of this client in the svs.connectedclients pointer array - int number; + + // requested rate in bytes per second + int rate; + + // realtime this client connected + double connecttime; // reliable messages must be sent periodically double last_message; @@ -123,7 +143,7 @@ typedef struct client_s // can be added to at any time, copied and clear once per frame sizebuf_t message; - qbyte msgbuf[MAX_DATAGRAM]; + qbyte msgbuf[NET_MAXMESSAGE]; // EDICT_NUM(clientnum+1) edict_t *edict; @@ -140,21 +160,21 @@ typedef struct client_s char name[64], old_name[64]; int colors, old_colors; int frags, old_frags; - // other properties not sent across the network - int pmodel; + char playermodel[MAX_QPATH], old_model[MAX_QPATH]; + char playerskin[MAX_QPATH], old_skin[MAX_QPATH]; // visibility state float visibletime[MAX_EDICTS]; -#ifdef QUAKEENTITIES - // delta compression state - float nextfullupdate[MAX_EDICTS]; -#elif 0 - entity_database_t entitydatabase; - int entityframenumber; // incremented each time an entity frame is sent -#else - entity_database4_t *entitydatabase4; - int entityframenumber; // incremented each time an entity frame is sent -#endif + + // 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; } client_t; @@ -174,6 +194,7 @@ typedef struct client_s #define MOVETYPE_BOUNCE 10 #define MOVETYPE_BOUNCEMISSILE 11 // bounce w/o gravity #define MOVETYPE_FOLLOW 12 // track movement of aiment +#define MOVETYPE_FAKEPUSH 13 // tenebrae's push that doesn't push // edict->solid values #define SOLID_NOT 0 // no interaction with other objects @@ -247,7 +268,15 @@ extern cvar_t sv_idealpitchscale; extern cvar_t sv_aim; extern cvar_t sv_stepheight; extern cvar_t sv_jumpstep; -extern cvar_t sv_maxplayers; +extern cvar_t sv_public; +extern cvar_t sv_maxrate; + +extern cvar_t sv_gameplayfix_grenadebouncedownslopes; +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 mempool_t *sv_clients_mempool; extern mempool_t *sv_edicts_mempool; @@ -261,8 +290,6 @@ extern client_t *host_client; extern jmp_buf host_abortserver; -extern edict_t *sv_player; - //=========================================================== void SV_Init (void); @@ -271,6 +298,7 @@ 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_ConnectClient (int clientnum, netconn_t *netconnection); void SV_DropClient (qboolean crash); void SV_SendClientMessages (void); @@ -278,7 +306,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(char *s, int precachemode); +int SV_SoundIndex(char *s, int precachemode); void SV_SetIdealPitch (void); @@ -286,15 +319,18 @@ void SV_AddUpdates (void); void SV_ClientThink (void); -void SV_ClientPrintf (const char *fmt, ...); -void SV_BroadcastPrintf (const char *fmt, ...); +void SV_ClientPrint(const char *msg); +void SV_ClientPrintf(const char *fmt, ...); +void SV_BroadcastPrint(const char *msg); +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); -void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg); +void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg, int *stats); void SV_MoveToGoal (void);