X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=server.h;h=d2e6c303bb0ba1bf7765e5f1f8a79d75679663e3;hp=3cf0fcf293150abc97754cee1487e0807d3cdb13;hb=712073c2b82a8d7289ced8b7cf16535b6c5550b4;hpb=f097be3975888aeb24c9ad958f24b651dc552c1f

diff --git a/server.h b/server.h
index 3cf0fcf2..d2e6c303 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;
@@ -32,13 +32,15 @@ typedef struct
 	int serverflags;
 	// cleared when at SV_SpawnServer
 	qboolean changelevel_issued;
+	// server infostring
+	char serverinfo[MAX_SERVERINFO_STRING];
 } server_static_t;
 
 //=============================================================================
 
-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;
@@ -50,9 +52,6 @@ typedef struct
 	// one of the PROTOCOL_ values
 	protocolversion_t protocol;
 
-	// used for running multiple steps in one frame, etc
-	double timer;
-
 	double time;
 
 	double frametime;
@@ -83,15 +82,15 @@ typedef struct
 	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
@@ -107,10 +106,6 @@ typedef struct client_s
 	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;
@@ -118,8 +113,8 @@ typedef struct client_s
 	// realtime this client connected
 	double connecttime;
 
-	// reliable messages must be sent periodically
-	double last_message;
+	// keepalive messages must be sent periodically during signon
+	double keepalivetime;
 
 	// communications handle
 	netconn_t *netconnection;
@@ -130,9 +125,6 @@ typedef struct client_s
 	// 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;
 
@@ -143,6 +135,9 @@ typedef struct client_s
 #endif
 	// LordHavoc: can be used for prediction or whatever...
 	float ping;
+	
+	// this is used by sv_clmovement_minping code
+	double clmovement_disable_minpingtimeout;
 
 // spawn parms are carried from level to level
 	float spawn_parms[NUM_SPAWN_PARMS];
@@ -163,6 +158,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;
@@ -246,16 +245,18 @@ extern cvar_t coop;
 extern cvar_t fraglimit;
 extern cvar_t timelimit;
 extern cvar_t pausable;
-extern cvar_t sv_deltacompress;
 extern cvar_t sv_maxvelocity;
 extern cvar_t sv_gravity;
 extern cvar_t sv_nostep;
 extern cvar_t sv_friction;
+extern cvar_t sv_waterfriction;
 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_airaccelerate;
+extern cvar_t sv_wateraccelerate;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;
 extern cvar_t sv_stepheight;
@@ -271,6 +272,10 @@ 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 cvar_t sv_gameplayfix_qwplayerphysics;
+
+extern cvar_t sys_ticrate;
+extern cvar_t sv_fixedframeratesingleplayer;
 
 extern mempool_t *sv_mempool;
 
@@ -316,11 +321,14 @@ 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 (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 (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats);
 
 void SV_MoveToGoal (void);