X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=server.h;h=3843e38d8ec35c64bfc29fc8060b32bde54808e1;hb=927449b5ad3a24c07444744df5273d64c79a67f1;hp=273b3de9e6bfcf7dee5e6f82195b62cf57f93acd;hpb=eb3d71b9feaefca24fe80b9970eb11d07fd295b5;p=xonotic%2Fdarkplaces.git diff --git a/server.h b/server.h index 273b3de9..3843e38d 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,18 @@ 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 + int maxclients; + // [maxclients] + struct client_s *clients; + // episode completion information + int serverflags; + // cleared when at SV_SpawnServer + qboolean changelevel_issued; } server_static_t; //============================================================================= @@ -34,90 +39,125 @@ 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; + + 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 + char *model_precache[MAX_MODELS]; + struct model_s *models[MAX_MODELS]; + // NULL terminated + char *sound_precache[MAX_SOUNDS]; + 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 + edict_t *edicts; + // can be array indexed + edict_t **edictstable; + // array of QC edict field variables + void *edictsfields; + // PushMove sometimes has to move entities back from a failed move + edict_t **moved_edicts; + // some actions are only valid during load + server_state_t state; + + sizebuf_t datagram; + qbyte datagram_buf[MAX_DATAGRAM]; + + // copied to all clients at end of frame + sizebuf_t reliable_datagram; + qbyte reliable_datagram_buf[MAX_DATAGRAM]; + + sizebuf_t signon; + // LordHavoc: increased signon message buffer from 8192 to 32768 + qbyte signon_buf[32768]; } server_t; -#define NUM_PING_TIMES 16 -#define NUM_SPAWN_PARMS 16 +#define NUM_PING_TIMES 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 - - struct qsocket_s *netconnection; // communications handle - - usercmd_t cmd; // movement - vec3_t wishdir; // intended motion calced from cmd - - 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; + // false = client is free + qboolean active; + // false = don't send datagrams + qboolean spawned; + // has been told to go to another level + 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 - 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 + // reliable messages must be sent periodically + double last_message; + + // communications handle + struct qsocket_s *netconnection; + + // 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[MAX_DATAGRAM]; + // 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]; + float spawn_parms[NUM_SPAWN_PARMS]; // client known data for deltas - int old_frags; - int pmodel; + int old_frags; + int pmodel; #ifdef QUAKEENTITIES // delta compression state - float nextfullupdate[MAX_EDICTS]; + float nextfullupdate[MAX_EDICTS]; #endif // visibility state - float visibletime[MAX_EDICTS]; + float visibletime[MAX_EDICTS]; #ifndef QUAKEENTITIES entity_database_t entitydatabase; - int entityframenumber; // incremented each time an entity frame is sent + int entityframenumber; // incremented each time an entity frame is sent #endif } client_t; @@ -160,7 +200,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 @@ -211,9 +250,13 @@ 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 server_static_t svs; // persistant server info -extern server_t sv; // local server +// persistant server info +extern server_static_t svs; +// local server +extern server_t sv; extern client_t *host_client; @@ -234,7 +277,7 @@ void SV_DropClient (qboolean crash); void SV_SendClientMessages (void); void SV_ClearDatagram (void); -int SV_ModelIndex (char *name); +int SV_ModelIndex (const char *name); void SV_SetIdealPitch (void); @@ -243,8 +286,8 @@ 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_ClientPrintf (const char *fmt, ...); +void SV_BroadcastPrintf (const char *fmt, ...); void SV_Physics (void); @@ -258,4 +301,11 @@ void SV_MoveToGoal (void); void SV_CheckForNewClients (void); void SV_RunClients (void); void SV_SaveSpawnparms (void); -void SV_SpawnServer (char *server); +void SV_SpawnServer (const char *server); + +void SV_SetMaxClients(int n); + +void SV_CheckVelocity (edict_t *ent); + +#endif +