eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index c50db411eb7269a06cc6dbddd35c227f5720a988..995db0a4b07beb15b470ed0a6c2ede0e9ec4d5b2 100644 (file)
--- a/client.h
+++ b/client.h
@@ -57,7 +57,7 @@ typedef struct effect_s
 }
 cl_effect_t;
 
-typedef struct
+typedef struct beam_s
 {
        int             entity;
        // draw this as lightning polygons, or a model?
@@ -138,7 +138,7 @@ typedef struct rtlight_s
        int static_numleafs;
        int static_numleafpvsbytes;
        int *static_leaflist;
-       qbyte *static_leafpvs;
+       unsigned char *static_leafpvs;
        // surfaces seen by light
        int static_numsurfaces;
        int *static_surfacelist;
@@ -243,8 +243,11 @@ typedef struct entity_render_s
        model_t *model;
        // current uninterpolated animation frame (for things which do not use interpolation)
        int frame;
-       // entity shirt and pants colors
+       // entity shirt and pants colors (-1 if not colormapped)
        int colormap;
+       // literal colors for renderer
+       vec3_t colormap_pantscolor;
+       vec3_t colormap_shirtcolor;
        // light, particles, etc
        int effects;
        // for Alias models
@@ -329,7 +332,7 @@ typedef struct entity_s
 }
 entity_t;
 
-typedef struct
+typedef struct usercmd_s
 {
        vec3_t  viewangles;
 
@@ -353,20 +356,20 @@ typedef struct
        int sequence;
 } usercmd_t;
 
-typedef struct
+typedef struct lightstyle_s
 {
        int             length;
        char    map[MAX_STYLESTRING];
 } lightstyle_t;
 
-typedef struct
+typedef struct scoreboard_s
 {
        char    name[MAX_SCOREBOARDNAME];
        int             frags;
        int             colors; // two 4 bit fields
 } scoreboard_t;
 
-typedef struct
+typedef struct cshift_s
 {
        int             destcolor[3];
        int             percent;                // 0-256
@@ -403,7 +406,7 @@ cactive_t;
 // the client_static_t structure is persistent through an arbitrary number
 // of server connections
 //
-typedef struct
+typedef struct client_static_s
 {
        cactive_t state;
 
@@ -449,7 +452,7 @@ typedef struct
        netconn_t *netcon;
        // writing buffer to send to server
        sizebuf_t message;
-       qbyte message_buf[1024];
+       unsigned char message_buf[1024];
 }
 client_static_t;
 
@@ -471,7 +474,7 @@ client_movementqueue_t;
 // the client_state_t structure is wiped completely at every
 // server signon
 //
-typedef struct
+typedef struct client_state_s
 {
        // true if playing in a local game and no one else is connected
        int islocalgame;
@@ -694,7 +697,7 @@ extern int cl_num_brushmodel_entities;
 
 extern mempool_t *cl_mempool;
 extern entity_t *cl_entities;
-extern qbyte *cl_entities_active;
+extern unsigned char *cl_entities_active;
 extern entity_t *cl_static_entities;
 extern entity_t *cl_temp_entities;
 extern int *cl_brushmodel_entities;
@@ -707,7 +710,6 @@ extern lightstyle_t *cl_lightstyle;
 extern client_state_t cl;
 
 extern void CL_AllocDlight (entity_render_t *ent, matrix4x4_t *matrix, float radius, float red, float green, float blue, float decay, float lifetime, int cubemapnum, int style, int shadowenable, vec_t corona, vec_t coronasizescale, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int flags);
-extern void CL_DecayLights (void);
 
 //=============================================================================
 
@@ -732,7 +734,7 @@ extern cvar_t cl_beams_lightatend;
 //
 // cl_input
 //
-typedef struct
+typedef struct kbutton_s
 {
        int             down[2];                // key nums holding it down
        int             state;                  // low bit is down state
@@ -862,7 +864,7 @@ void R_NewExplosion(vec3_t org);
 
 #include "cl_screen.h"
 
-typedef struct
+typedef struct refdef_s
 {
        // area to render in
        int x, y, width, height;
@@ -898,15 +900,23 @@ typedef struct
        int numentities;
        int maxentities;
 
+       // renderable dynamic lights
+       dlight_t *lights[MAX_DLIGHTS];
+       int numlights;
+
+       // 8.8bit fixed point intensities for light styles
+       // controls intensity of dynamic lights and lightmap layers
+       unsigned short  lightstylevalue[256];   // 8.8 fraction of base light value
+
        // 2D art drawing queue
        // TODO: get rid of this
-       qbyte *drawqueue;
+       unsigned char *drawqueue;
        int drawqueuesize;
        int maxdrawqueuesize;
 }
 refdef_t;
 
-refdef_t r_refdef;
+extern refdef_t r_refdef;
 
 #include "cgamevm.h"