added DP_CON_SET and DP_CON_SETA extensions

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 726d16f1e986eb65ccebf92a02f3c3764f6ae7c1..13d285939852f6c8f2de6c4ee362aebbfd050f7c 100644 (file)
--- a/client.h
+++ b/client.h
@@ -540,8 +540,10 @@ typedef struct
        int protocol;
 
        // entity database stuff
-       entity_database_t entitydatabase;
-       entity_database4_t *entitydatabase4;
+       // latest received entity frame number
+       int latestframenum;
+       entityframe_database_t *entitydatabase;
+       entityframe4_database_t *entitydatabase4;
 }
 client_state_t;
 
@@ -586,13 +588,13 @@ extern cvar_t m_side;
 
 extern cvar_t r_draweffects;
 
-extern cvar_t cl_explosions;
 extern cvar_t cl_explosions_alpha_start;
 extern cvar_t cl_explosions_alpha_end;
 extern cvar_t cl_explosions_size_start;
 extern cvar_t cl_explosions_size_end;
 extern cvar_t cl_explosions_lifetime;
 extern cvar_t cl_stainmaps;
+extern cvar_t cl_stainmapsclearonload;
 
 // these are updated by CL_ClearState
 extern int cl_num_entities;
@@ -600,6 +602,7 @@ extern int cl_num_static_entities;
 extern int cl_num_temp_entities;
 extern int cl_num_brushmodel_entities;
 
+extern mempool_t *cl_entities_mempool;
 extern entity_t *cl_entities;
 extern qbyte *cl_entities_active;
 extern entity_t *cl_static_entities;
@@ -653,6 +656,8 @@ void CL_InitInput (void);
 void CL_SendCmd (usercmd_t *cmd);
 void CL_SendMove (usercmd_t *cmd);
 
+void CL_ValidateState(entity_state_t *s);
+void CL_MoveLerpEntityStates(entity_t *ent);
 void CL_LerpUpdate(entity_t *e);
 void CL_ParseTEnt (void);
 void CL_RelinkBeams (void);
@@ -719,8 +724,7 @@ void CL_Particles_Init(void);
 
 void CL_ParseParticleEffect (void);
 void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count);
-void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent);
-void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent);
+void CL_RocketTrail (vec3_t start, vec3_t end, int type, int color, entity_t *ent);
 void CL_SparkShower (vec3_t org, vec3_t dir, int count);
 void CL_PlasmaBurn (vec3_t org);
 void CL_BloodPuff (vec3_t org, vec3_t vel, int count);