X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=server.h;h=70a8348b949cc30899e83c7f6537994dc2b1fd1e;hb=e440cc14e7e83d07f12c13279e565591655229d7;hp=15f519325d181c8320e8a29cd9ab5e52664121ca;hpb=19f1b34facf77d7c0858b910e6579e635712e98a;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index 15f51932..70a8348b 100644
--- a/server.h
+++ b/server.h
@@ -52,6 +52,9 @@ typedef struct
 	// this disables extensions when using PROTOCOL_QUAKE
 	qboolean netquakecompatible;
 
+	// used for running multiple steps in one frame, etc
+	double timer;
+
 	double time;
 
 	double frametime;
@@ -66,10 +69,14 @@ typedef struct
 	char modelname[64];
 	struct model_s *worldmodel;
 	// NULL terminated
-	char *model_precache[MAX_MODELS];
+	// 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
-	char *sound_precache[MAX_SOUNDS];
+	// 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];
 	int num_edicts;
 	int max_edicts;
@@ -117,6 +124,12 @@ typedef struct client_s
 	// remove this client immediately
 	qboolean deadsocket;
 
+	// requested rate in bytes per second
+	int rate;
+
+	// realtime this client connected
+	double connecttime;
+
 	// reliable messages must be sent periodically
 	double last_message;
 
@@ -147,6 +160,8 @@ typedef struct client_s
 	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];
 
 	// visibility state
 	float visibletime[MAX_EDICTS];
@@ -154,6 +169,9 @@ typedef struct client_s
 	// prevent animated names
 	float nametime;
 
+	// latest received clc_ackframe (used to detect packet loss)
+	int latestframenum;
+
 	entityframe_database_t *entitydatabase;
 	entityframe4_database_t *entitydatabase4;
 	entityframe5_database_t *entitydatabase5;
@@ -258,6 +276,7 @@ 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 mempool_t *sv_clients_mempool;
 extern mempool_t *sv_edicts_mempool;
@@ -271,8 +290,6 @@ extern client_t *host_client;
 
 extern jmp_buf host_abortserver;
 
-extern edict_t *sv_player;
-
 //===========================================================
 
 void SV_Init (void);
@@ -281,6 +298,7 @@ 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_ConnectClient (int clientnum, netconn_t *netconnection);
 void SV_DropClient (qboolean crash);
 
 void SV_SendClientMessages (void);
@@ -288,7 +306,12 @@ void SV_ClearDatagram (void);
 
 void SV_ReadClientMessage(void);
 
-int SV_ModelIndex (const char *name);
+// precachemode values:
+// 0 = fail if not precached,
+// 1 = warn if not found and precache if possible
+// 2 = precache
+int SV_ModelIndex(char *s, int precachemode);
+int SV_SoundIndex(char *s, int precachemode);
 
 void SV_SetIdealPitch (void);
 
@@ -307,7 +330,7 @@ qboolean SV_PlayerCheckGround (edict_t *ent);
 qboolean SV_CheckBottom (edict_t *ent);
 qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink);
 
-void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg);
+void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg, int *stats);
 
 void SV_MoveToGoal (void);