X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=server.h;h=f42c67eda890a8b689987118d40e469f10ef3ad7;hb=71c88e4a876a4cfcccf312e3cd4ddbb1ced6d11f;hp=d369777312bc8ce3b862a6b341086e62277a29e8;hpb=8a92179c65adcd7d7b40c34259c8e4737ccdc7bc;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index d3697773..f42c67ed 100644
--- a/server.h
+++ b/server.h
@@ -69,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;
@@ -163,6 +167,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;
@@ -267,6 +274,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;
@@ -296,7 +304,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);
 
@@ -315,7 +328,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);