X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=f76e0f8af6a2b3c6fdd58f4a1e1f04abb5940616;hb=2ca3c4f06325e060856e75634d584a0f19f1df12;hp=a35b42cd4d3f81b2fd6fddf2e2ed553b638a58d1;hpb=31bfe80dd809721f0665fbe58f8d4eb3160aeb14;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index a35b42cd..f76e0f8a 100644 --- a/server.h +++ b/server.h @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef SERVER_H #define SERVER_H -typedef struct +typedef struct server_static_s { // number of svs.clients slots (updated by maxplayers command) int maxclients; @@ -36,9 +36,9 @@ typedef struct //============================================================================= -typedef enum {ss_loading, ss_active} server_state_t; +typedef enum server_state_e {ss_loading, ss_active} server_state_t; -typedef struct +typedef struct server_s { // false if only a net client qboolean active; @@ -76,43 +76,35 @@ typedef struct // updated by SV_SoundIndex char sound_precache[MAX_SOUNDS][MAX_QPATH]; char lightstyles[MAX_LIGHTSTYLES][64]; - 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; // 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; sizebuf_t datagram; - qbyte datagram_buf[NET_MAXMESSAGE]; + unsigned char datagram_buf[NET_MAXMESSAGE]; // copied to all clients at end of frame sizebuf_t reliable_datagram; - qbyte reliable_datagram_buf[NET_MAXMESSAGE]; + unsigned char reliable_datagram_buf[NET_MAXMESSAGE]; sizebuf_t signon; // LordHavoc: increased signon message buffer from 8192 - qbyte signon_buf[NET_MAXMESSAGE]; + unsigned char 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 @@ -140,13 +132,15 @@ 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; + unsigned char 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; @@ -169,6 +163,10 @@ typedef struct client_s // latest received clc_ackframe (used to detect packet loss) int latestframenum; + // cache weaponmodel name lookups + char weaponmodel[MAX_QPATH]; + int weaponmodelindex; + entityframe_database_t *entitydatabase; entityframe4_database_t *entitydatabase4; entityframe5_database_t *entitydatabase5; @@ -260,6 +258,7 @@ 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; @@ -277,6 +276,9 @@ extern cvar_t sv_gameplayfix_setmodelrealbox; extern cvar_t sv_gameplayfix_blowupfallenzombies; extern cvar_t sv_gameplayfix_findradiusdistancetobox; +extern cvar_t sys_ticrate; +extern cvar_t sv_fixedframeratesingleplayer; + extern mempool_t *sv_mempool; // persistant server info @@ -286,15 +288,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, const 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); @@ -323,12 +323,15 @@ void SV_BroadcastPrint(const char *msg); void SV_BroadcastPrintf(const char *fmt, ...); void SV_Physics (void); +void SV_Physics_ClientEntity (prvm_edict_t *ent); -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 (client_t *client, edict_t *ent, sizebuf_t *msg, int *stats); +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 (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats); void SV_MoveToGoal (void); @@ -336,7 +339,12 @@ 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