X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=58e13ac5a0960f327a254f1bec24db2ae04e6a19;hb=31f1e296ff93e8e471b9e45542e024615a108930;hp=c6ec424e14f83f91376b5f9d6c971aca8926180d;hpb=919fbb05eeafd41c867b1f39bb2cc9e5dd61077e;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index c6ec424e..58e13ac5 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;
@@ -83,15 +83,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,8 +107,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;
 
@@ -130,9 +128,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;
 
@@ -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,7 +245,6 @@ 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;
@@ -254,6 +252,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;
@@ -271,6 +270,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
@@ -315,11 +317,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);