fix id1 demos to not show deathmatch overlay (they incorrectly contain

[xonotic/darkplaces.git] / draw.h

diff --git a/draw.h b/draw.h
index 1e6be9082581e3a34254b9665b233f338017d3e8..8646c6a30155cbad56350c70aca8e4354a5df1cc 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -38,8 +38,18 @@ typedef struct cachepic_s
 }
 cachepic_t;
 
+typedef enum cachepicflags_e
+{
+       CACHEPICFLAG_NOTPERSISTENT = 1,
+       CACHEPICFLAG_QUIET = 2,
+       CACHEPICFLAG_NOCOMPRESSION = 4,
+       CACHEPICFLAG_NOCLAMP = 8,
+}
+cachepicflags_t;
+
 void Draw_Init (void);
-cachepic_t *Draw_CachePic (const char *path, qboolean persistent);
+cachepic_t *Draw_CachePic_Flags (const char *path, unsigned int cachepicflags);
+cachepic_t *Draw_CachePic (const char *path); // standard function with no options, used throughout engine
 // create or update a pic's image
 cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels);
 // free the texture memory used by a pic
@@ -54,7 +64,7 @@ typedef struct drawqueuemesh_s
        rtexture_t *texture;
        int num_triangles;
        int num_vertices;
-       int *data_element3i;
+       unsigned short *data_element3s;
        float *data_vertex3f;
        float *data_texcoord2f;
        float *data_color4f;
@@ -72,7 +82,9 @@ DRAWFLAG_NUMFLAGS
 typedef struct dp_font_s
 {
        rtexture_t *tex;
-       float width_of[256]; // width_of[0] == max width of any char; 1.0f is base width (1/16 of texture width); therefore, all widths have to be <= 1
+       float width_of[256]; // width_of[0] == max width of any char; 1.0f is base width (1/16 of texture width); therefore, all widths have to be <= 1 (does not include scale)
+       float maxwidth; // precalculated max width of the font (includes scale)
+       float scale; // scales the font (without changing line height!)
        char texpath[MAX_QPATH];
        char title[MAX_QPATH];
 }