fix crash when loading progs/null.spr in nehahra, which has 0x0 size

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index e07384c2488509fe7bc47af39a062d7b6ee9f724..78392e93066097a80b317e213951818cb3e37715 100644 (file)
--- a/client.h
+++ b/client.h
@@ -245,6 +245,8 @@ typedef struct entity_render_s
        model_t *model;
        // current uninterpolated animation frame (for things which do not use interpolation)
        int frame;
+       // number of the entity represents, or 0 for non-network entities
+       int entitynumber;
        // entity shirt and pants colors (-1 if not colormapped)
        int colormap;
        // literal colors for renderer
@@ -252,6 +254,8 @@ typedef struct entity_render_s
        vec3_t colormap_shirtcolor;
        // light, particles, etc
        int effects;
+       // qw CTF flags and other internal-use-only effect bits
+       int internaleffects;
        // for Alias models
        int skinnum;
        // render flags
@@ -296,6 +300,7 @@ typedef struct entity_persistent_s
 
        // particle trail
        float trail_time;
+       qboolean trail_allowed; // set to false by teleports, true by update code, prevents bad lerps
 
        // muzzleflash fading
        float muzzleflash;
@@ -355,6 +360,7 @@ typedef struct usercmd_s
        int impulse;
        int sequence;
        qboolean applied; // if false we're still accumulating a move
+       qboolean predicted; // if true the sequence should be sent as 0
 } usercmd_t;
 
 typedef struct lightstyle_s
@@ -578,6 +584,7 @@ typedef struct client_movementqueue_s
        float move[3];
        qboolean jump;
        qboolean crouch;
+       qboolean canjump;
 }
 client_movementqueue_t;
 
@@ -640,6 +647,9 @@ typedef struct particle_s
        model_t         *ownermodel; // model the decal is stuck to (used to make sure the entity is still alive)
        vec3_t          relativeorigin; // decal at this location in entity's coordinate space
        vec3_t          relativedirection; // decal oriented this way relative to entity's coordinate space
+       float           delayedcollisions; // time that p->bounce becomes active
+       float           delayedspawn; // time that particle appears and begins moving
+       float           die; // time when this particle should be removed, regardless of alpha
 }
 particle_t;
 
@@ -681,6 +691,7 @@ typedef struct client_state_s
 // information for local display
        // health, etc
        int stats[MAX_CL_STATS];
+       float *statsf; // points to stats[] array
        // last known inventory bit flags, for blinking
        int olditems;
        // cl.time of acquiring item, for blinking
@@ -932,16 +943,24 @@ typedef struct client_state_s
        //qboolean qw_spectator;
 
        // movement parameters for client prediction
-       float qw_movevars_gravity;
-       float qw_movevars_stopspeed;
-       float qw_movevars_maxspeed; // can change during play
-       float qw_movevars_spectatormaxspeed;
-       float qw_movevars_accelerate;
-       float qw_movevars_airaccelerate;
-       float qw_movevars_wateraccelerate;
-       float qw_movevars_friction;
-       float qw_movevars_waterfriction;
-       float qw_movevars_entgravity; // can change during play
+       float movevars_ticrate;
+       float movevars_slowmo;
+       float movevars_gravity;
+       float movevars_stopspeed;
+       float movevars_maxspeed;
+       float movevars_spectatormaxspeed;
+       float movevars_accelerate;
+       float movevars_airaccelerate;
+       float movevars_wateraccelerate;
+       float movevars_friction;
+       float movevars_waterfriction;
+       float movevars_entgravity;
+       float movevars_jumpvelocity;
+       float movevars_edgefriction;
+       float movevars_maxairspeed;
+       float movevars_stepheight;
+       float movevars_airaccel_qw;
+       float movevars_airaccel_sideways_friction;
 
        // models used by qw protocol
        int qw_modelindex_spike;
@@ -963,6 +982,14 @@ typedef struct client_state_s
        int qw_deltasequence[QW_UPDATE_BACKUP];
 
        // csqc stuff:
+       // server entity number corresponding to a clientside entity
+       unsigned short csqc_server2csqcentitynumber[MAX_EDICTS];
+       qboolean csqc_loaded;
+       vec3_t csqc_origin;
+       vec3_t csqc_angles;
+       qboolean csqc_usecsqclistener;
+       matrix4x4_t csqc_listenermatrix;
+       char csqc_printtextbuf[MAX_INPUTLINE];
 
        // collision culling data
        world_t world;
@@ -972,6 +999,11 @@ typedef struct client_state_s
        // this is updated to cl.movement_origin whenever health is < 1
        // used by %d print in say/say_team messages if cl_locs_enable is on
        vec3_t lastdeathorigin;
+
+       // processing buffer used by R_BuildLightMap, reallocated as needed,
+       // freed on each level change
+       size_t buildlightmapmemorysize;
+       unsigned char *buildlightmapmemory;
 }
 client_state_t;