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

[xonotic/darkplaces.git] / cl_screen.h

diff --git a/cl_screen.h b/cl_screen.h
index 53156a92ca994440ffbc86ba361c3e016cc76855..49175273f6421bf5eeffed361dfd85969c18e951 100644 (file)
--- a/cl_screen.h
+++ b/cl_screen.h
@@ -11,7 +11,7 @@
 typedef struct drawqueue_s
 {
        unsigned short size;
-       qbyte command, flags;
+       unsigned char command, flags;
        unsigned int color;
        float x, y, scalex, scaley;
 }
@@ -33,7 +33,7 @@ typedef struct drawqueuemesh_s
 }
 drawqueuemesh_t;
 
-enum drawqueue_drawflag_e { 
+enum drawqueue_drawflag_e {
 DRAWFLAG_NORMAL,
 DRAWFLAG_ADDITIVE,
 DRAWFLAG_MODULATE,
@@ -41,16 +41,23 @@ DRAWFLAG_2XMODULATE,
 DRAWFLAG_NUMFLAGS
 };
 
+// shared color tag printing constants
+#define STRING_COLOR_TAG                       '^'
+#define STRING_COLOR_DEFAULT           7
+#define STRING_COLOR_DEFAULT_STR       "^7"
+
 // clear the draw queue
 void DrawQ_Clear(void);
 // draw an image
-void DrawQ_Pic(float x, float y, char *picname, float width, float height, float red, float green, float blue, float alpha, int flags);
+void DrawQ_Pic(float x, float y, const char *picname, float width, float height, float red, float green, float blue, float alpha, int flags);
 // draw a text string
 void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags);
+// draw a text string that supports color tags (colorindex can either be NULL, -1 to make it choose the default color or valid index to start with)
+void DrawQ_ColoredString( float x, float y, const char *text, int maxlen, float scalex, float scaley, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor );
 // draw a filled rectangle
 void DrawQ_Fill(float x, float y, float w, float h, float red, float green, float blue, float alpha, int flags);
 // draw a very fancy pic (per corner texcoord/color control), the order is tl, tr, bl, br
-void DrawQ_SuperPic(float x, float y, char *picname, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags);
+void DrawQ_SuperPic(float x, float y, const char *picname, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags);
 // draw a triangle mesh
 void DrawQ_Mesh(drawqueuemesh_t *mesh, int flags);
 // set the clipping area
@@ -65,7 +72,11 @@ void SHOWLMP_clear(void);
 
 extern cvar_t vid_conwidth;
 extern cvar_t vid_conheight;
+extern cvar_t vid_pixelaspect;
 extern cvar_t scr_screenshot_jpeg;
+extern cvar_t scr_screenshot_jpeg_quality;
+extern cvar_t scr_screenshot_gamma;
+extern cvar_t scr_screenshot_name;
 
 void CL_Screen_NewMap(void);
 void CL_Screen_Init(void);