fix 256 frame limit (stupid legacy bug in entity_state_t building code)

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 6d43eb847e714dc0909f7a7ee7fdb1f5fbe7cee0..3fcc597bb754f6af37d0f7561a9ec14fb4b221d8 100644 (file)
--- 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;
@@ -153,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];
@@ -160,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;
@@ -264,9 +276,9 @@ 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;
+extern mempool_t *sv_mempool;
 
 // persistant server info
 extern server_static_t svs;
@@ -277,8 +289,6 @@ extern client_t *host_client;
 
 extern jmp_buf host_abortserver;
 
-extern edict_t *sv_player;
-
 //===========================================================
 
 void SV_Init (void);
@@ -295,7 +305,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);
 
@@ -314,7 +329,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);