unsigned long vs. size_t printf format warning fix

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 6f281456f8941b9cde27008749a5d5e656230c47..62d11f0d21669cd686975499313ae59c75b96411 100644 (file)
--- a/server.h
+++ b/server.h
@@ -146,7 +146,7 @@ typedef struct server_s
        int writeentitiestoclient_numeyes;
        int writeentitiestoclient_pvsbytes;
        unsigned char writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
-       entity_state_t writeentitiestoclient_sendstates[MAX_EDICTS];
+       const entity_state_t *writeentitiestoclient_sendstates[MAX_EDICTS];
        unsigned short writeentitiestoclient_csqcsendstates[MAX_EDICTS];
 
        int numsendentities;
@@ -199,6 +199,8 @@ typedef struct client_s
        netconn_t *netconnection;
 
        int movesequence;
+       signed char movement_count[NETGRAPH_PACKETS];
+       int movement_highestsequence_seen; // not the same as movesequence if prediction is off
        /// movement
        usercmd_t cmd;
        /// intended motion calced from cmd
@@ -432,8 +434,10 @@ extern cvar_t sv_gameplayfix_setmodelrealbox;
 extern cvar_t sv_gameplayfix_slidemoveprojectiles;
 extern cvar_t sv_gameplayfix_stepdown;
 extern cvar_t sv_gameplayfix_stepwhilejumping;
+extern cvar_t sv_gameplayfix_stepmultipletimes;
 extern cvar_t sv_gameplayfix_swiminbmodels;
 extern cvar_t sv_gameplayfix_upwardvelocityclearsongroundflag;
+extern cvar_t sv_gameplayfix_downtracesupportsongroundflag;
 extern cvar_t sv_gravity;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_jumpstep;
@@ -442,7 +446,6 @@ extern cvar_t sv_maxairspeed;
 extern cvar_t sv_maxrate;
 extern cvar_t sv_maxspeed;
 extern cvar_t sv_maxvelocity;
-extern cvar_t sv_newflymove;
 extern cvar_t sv_nostep;
 extern cvar_t sv_playerphysicsqc;
 extern cvar_t sv_progs;
@@ -560,6 +563,7 @@ void SV_VM_End(void);
 const char *Host_TimingReport(void); ///< for output in Host_Status_f
 
 int SV_GetPitchSign(prvm_edict_t *ent);
+void SV_GetEntityMatrix (prvm_edict_t *ent, matrix4x4_t *out, qboolean viewmatrix);
 
 #endif