X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=8e94e5adb63cf76bd6af20a45dd7324e81a9a3d2;hb=ea4fc545e8444f579d88d8f096b054dcd7bc482f;hp=5ee45a3114e3417fa2e9d17d038d2733724ee298;hpb=fb5638603d5fb14033bb41a99dbaba135b5e7985;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index 5ee45a31..8e94e5ad 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,11 @@ typedef struct // handle connections specially qboolean loadgame; + // one of the PROTOCOL_ values + int protocol; + // this disables extensions when using PROTOCOL_QUAKE + qboolean netquakecompatible; + double time; double frametime; @@ -67,25 +73,31 @@ typedef struct char *lightstyles[MAX_LIGHTSTYLES]; int num_edicts; int max_edicts; - // can NOT be array indexed, because edict_t is variable sized, but can be used to reference the world ent + // small edict_t structures which just contain pointers + // (allocated at server startup only) edict_t *edicts; - // can be array indexed - edict_t **edictstable; - // array of QC edict field variables + // 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; + // PushMove sometimes has to move entities back from a failed move + // (dynamically resized) + edict_t **moved_edicts; // some actions are only valid during load 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; @@ -94,7 +106,7 @@ typedef struct typedef struct client_s { - // false = client is free + // false = empty client slot qboolean active; // false = don't send datagrams qboolean spawned; @@ -102,20 +114,16 @@ typedef struct client_s qboolean dropasap; // only valid before spawned qboolean sendsignon; - -#ifndef NOROUTINGFIX - // 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; -#endif + // remove this client immediately + qboolean deadsocket; + // index of this client in the svs.clients array + int number; // reliable messages must be sent periodically double last_message; // communications handle - struct qsocket_s *netconnection; + netconn_t *netconnection; // movement usercmd_t cmd; @@ -124,39 +132,35 @@ typedef struct client_s // can be added to at any time, copied and clear once per frame sizebuf_t message; - qbyte msgbuf[MAX_MSGLEN]; + 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; + // properties that are sent across the network only when changed + char name[64], old_name[64]; + int colors, old_colors; + int frags, old_frags; + // other properties not sent across the network int pmodel; -#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; + + entityframe_database_t *entitydatabase; + entityframe4_database_t *entitydatabase4; + entityframe5_database_t *entitydatabase5; } client_t; @@ -176,6 +180,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,9 +252,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 mempool_t *sv_clients_mempool; +extern mempool_t *sv_edicts_mempool; // persistant server info extern server_static_t svs; @@ -275,6 +290,8 @@ void SV_DropClient (qboolean crash); void SV_SendClientMessages (void); void SV_ClearDatagram (void); +void SV_ReadClientMessage(void); + int SV_ModelIndex (const char *name); void SV_SetIdealPitch (void); @@ -282,13 +299,15 @@ 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); @@ -296,12 +315,11 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg); 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