X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=3fcc597bb754f6af37d0f7561a9ec14fb4b221d8;hb=ae83ea5c8eadb87c0255bc97b5fe455ca7f55301;hp=b9f3aa86576ecc1ab392a2ceabdcd0831f41de0c;hpb=14418daa3cb38466864cd7cc53001bbb1bac2b22;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index b9f3aa86..3fcc597b 100644 --- a/server.h +++ b/server.h @@ -24,8 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef struct { + // number of svs.clients slots (updated by maxplayers command) int maxclients; - // [maxclients] + // client slots struct client_s *clients; // episode completion information int serverflags; @@ -46,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; @@ -60,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; @@ -83,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; @@ -100,7 +113,7 @@ typedef struct typedef struct client_s { - // false = client is free + // false = empty client slot qboolean active; // false = don't send datagrams qboolean spawned; @@ -108,18 +121,20 @@ typedef struct client_s qboolean dropasap; // only valid before spawned qboolean sendsignon; + // remove this client immediately + qboolean deadsocket; + + // requested rate in bytes per second + int rate; - // LordHavoc: to make netquake protocol get through NAT routers, have to wait for client to ack - // waiting for connect from client (stage 1) - qboolean waitingforconnect; - // send server info in next datagram (stage 2) - qboolean sendserverinfo; + // realtime this client connected + double connecttime; // reliable messages must be sent periodically double last_message; // communications handle - struct qsocket_s *netconnection; + netconn_t *netconnection; // movement usercmd_t cmd; @@ -128,39 +143,38 @@ 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; - // for printing to other people - char name[32]; - int colors; float ping_times[NUM_PING_TIMES]; // ping_times[num_pings%NUM_PING_TIMES] int num_pings; // LordHavoc: can be used for prediction or whatever... float ping; - // LordHavoc: specifically used for prediction, accounts for sys_ticrate too - float latency; // spawn parms are carried from level to level float spawn_parms[NUM_SPAWN_PARMS]; -// client known data for deltas - int old_frags; - int pmodel; + // properties that are sent across the network only when changed + 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]; -#ifdef QUAKEENTITIES - // delta compression state - float nextfullupdate[MAX_EDICTS]; -#endif // visibility state float visibletime[MAX_EDICTS]; -#ifndef QUAKEENTITIES - entity_database_t entitydatabase; - 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; @@ -180,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 @@ -251,9 +266,19 @@ extern cvar_t sv_maxspeed; extern cvar_t sv_accelerate; extern cvar_t sv_idealpitchscale; extern cvar_t sv_aim; -extern cvar_t sv_predict; extern cvar_t sv_stepheight; extern cvar_t sv_jumpstep; +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_mempool; // persistant server info extern server_static_t svs; @@ -264,8 +289,6 @@ extern client_t *host_client; extern jmp_buf host_abortserver; -extern edict_t *sv_player; - //=========================================================== void SV_Init (void); @@ -274,39 +297,46 @@ 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); void SV_ClearDatagram (void); -int SV_ModelIndex (const char *name); +void SV_ReadClientMessage(void); + +// 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); void SV_AddUpdates (void); void SV_ClientThink (void); -void SV_AddClientToServer (struct qsocket_s *ret); -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); -void SV_CheckForNewClients (void); void SV_RunClients (void); void SV_SaveSpawnparms (void); void SV_SpawnServer (const char *server); -void SV_SetMaxClients(int n); - void SV_CheckVelocity (edict_t *ent); #endif