X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=server.h;h=ad31f39d23735ec378eb3c1f63ae8651c10177ac;hp=69be04310b83948845a594abcf7f84513c49ac5d;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hpb=6622dc0f50e46953e458b1b30505d2545ae5902b diff --git a/server.h b/server.h index 69be0431..ad31f39d 100644 --- a/server.h +++ b/server.h @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,13 +19,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // server.h +#ifndef SERVER_H +#define SERVER_H + typedef struct { - int maxclients; - int maxclientslimit; - struct client_s *clients; // [maxclients] - int serverflags; // episode completion information - qboolean changelevel_issued; // cleared when at SV_SpawnServer + // 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 + qboolean changelevel_issued; } server_static_t; //============================================================================= @@ -34,83 +40,132 @@ typedef enum {ss_loading, ss_active} server_state_t; typedef struct { - qboolean active; // false if only a net client - - qboolean paused; - qboolean loadgame; // handle connections specially - - double time; - - double frametime; - - int lastcheck; // used by PF_checkclient - double lastchecktime; - - char name[64]; // map name - char modelname[64]; // maps/.bsp, for model_precache[0] - struct model_s *worldmodel; - char *model_precache[MAX_MODELS]; // NULL terminated - struct model_s *models[MAX_MODELS]; - char *sound_precache[MAX_SOUNDS]; // NULL terminated - char *lightstyles[MAX_LIGHTSTYLES]; - int num_edicts; - int max_edicts; - edict_t *edicts; // can NOT be array indexed, because - // edict_t is variable sized, but can - // be used to reference the world ent - server_state_t state; // some actions are only valid during load - - sizebuf_t datagram; - byte datagram_buf[MAX_DATAGRAM]; - - sizebuf_t reliable_datagram; // copied to all clients at end of frame - byte reliable_datagram_buf[MAX_DATAGRAM]; - - sizebuf_t signon; - byte signon_buf[32768]; // LordHavoc: increased signon message buffer from 8192 to 32768 + // false if only a net client + qboolean active; + + qboolean paused; + // handle connections specially + qboolean loadgame; + + // one of the PROTOCOL_ values + protocolversion_t protocol; + + // used for running multiple steps in one frame, etc + double timer; + + double time; + + double frametime; + + // used by PF_checkclient + int lastcheck; + double lastchecktime; + + // map name + char name[64]; + // maps/.bsp, for model_precache[0] + char modelname[64]; + struct model_s *worldmodel; + // NULL terminated + // 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 + // 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) + prvm_edict_t **moved_edicts; + // some actions are only valid during load + server_state_t state; + + sizebuf_t datagram; + qbyte datagram_buf[NET_MAXMESSAGE]; + + // copied to all clients at end of frame + sizebuf_t reliable_datagram; + qbyte reliable_datagram_buf[NET_MAXMESSAGE]; + + sizebuf_t signon; + // LordHavoc: increased signon message buffer from 8192 + 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 +#define NUM_SPAWN_PARMS 16 typedef struct client_s { - qboolean active; // false = client is free - qboolean spawned; // false = don't send datagrams - qboolean dropasap; // has been told to go to another level - qboolean sendsignon; // only valid before spawned - - double last_message; // reliable messages must be sent - // periodically + // 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; + + // requested rate in bytes per second + int rate; + + // realtime this client connected + double connecttime; + + // reliable messages must be sent periodically + double last_message; + + // communications handle + netconn_t *netconnection; + + int movesequence; + // movement + usercmd_t cmd; + // intended motion calced from cmd + vec3_t wishdir; + + // can be added to at any time, copied and clear once per frame + sizebuf_t message; + qbyte msgbuf[NET_MAXMESSAGE]; + // 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; - struct qsocket_s *netconnection; // communications handle - - usercmd_t cmd; // movement - vec3_t wishdir; // intended motion calced from cmd +// spawn parms are carried from level to level + float spawn_parms[NUM_SPAWN_PARMS]; - sizebuf_t message; // can be added to at any time, - // copied and clear once per frame - byte msgbuf[MAX_MSGLEN]; - edict_t *edict; // EDICT_NUM(clientnum+1) - char name[32]; // for printing to other people - int colors; + // 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]; - float ping_times[NUM_PING_TIMES]; - int num_pings; // ping_times[num_pings%NUM_PING_TIMES] - float ping; // LordHavoc: can be used for prediction or whatever... - float latency; // LordHavoc: specifically used for prediction, accounts for sys_ticrate too + // visibility state + float visibletime[MAX_EDICTS]; -// spawn parms are carried from level to level - float spawn_parms[NUM_SPAWN_PARMS]; + // prevent animated names + float nametime; -// client known data for deltas - int old_frags; - int pmodel; + // latest received clc_ackframe (used to detect packet loss) + int latestframenum; - // delta compression state - float nextfullupdate[MAX_EDICTS]; - float lastvisible[MAX_EDICTS]; + entityframe_database_t *entitydatabase; + entityframe4_database_t *entitydatabase4; + entityframe5_database_t *entitydatabase5; } client_t; @@ -130,6 +185,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 @@ -152,7 +208,6 @@ typedef struct client_s // edict->flags #define FL_FLY 1 #define FL_SWIM 2 -//#define FL_GLIMPSE 4 #define FL_CONVEYOR 4 #define FL_CLIENT 8 #define FL_INWATER 16 @@ -199,55 +254,89 @@ extern cvar_t sv_friction; extern cvar_t sv_edgefriction; extern cvar_t sv_stopspeed; extern cvar_t sv_maxspeed; +extern cvar_t sv_maxairspeed; extern cvar_t sv_accelerate; extern cvar_t sv_idealpitchscale; extern cvar_t sv_aim; -extern cvar_t sv_predict; - -extern server_static_t svs; // persistant server info -extern server_t sv; // local server +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 cvar_t sv_gameplayfix_blowupfallenzombies; +extern cvar_t sv_gameplayfix_findradiusdistancetobox; + +extern mempool_t *sv_mempool; + +// persistant server info +extern server_static_t svs; +// local server +extern server_t sv; extern client_t *host_client; -extern jmp_buf host_abortserver; - -extern edict_t *sv_player; - //=========================================================== 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); void SV_SendClientMessages (void); void SV_ClearDatagram (void); -int SV_ModelIndex (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(const char *s, int precachemode); +int SV_SoundIndex(const 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 (char *fmt, ...); -void SV_BroadcastPrintf (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_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); + +struct trace_s SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents); -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_CheckForNewClients (void); -void SV_RunClients (void); +void SV_ApplyClientMove (void); void SV_SaveSpawnparms (void); -void SV_SpawnServer (char *server); +void SV_SpawnServer (const char *server); + +void SV_CheckVelocity (prvm_edict_t *ent); + +void SV_SetupVM(void); + +void SV_VM_Begin(void); +void SV_VM_End(void); + +#endif +