Go back to defining GL enums ourselves rather than relying on SDL_opengl.h on desktop.

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 4337a730225e5673636034eaceef38d0c15ec711..6eac13e19b66d2f157e5e5e0875e4d9b73a87f5f 100644 (file)
--- a/console.c
+++ b/console.c
@@ -1664,7 +1664,7 @@ static int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, flo
        int startidx;
        int nskip = 0;
        int continuationWidth = 0;
-       size_t l;
+       size_t len;
        double t = cl.time; // saved so it won't change
        con_text_info_t ti;
 
@@ -1676,10 +1676,10 @@ static int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, flo
        ti.ymax = y + height;
        ti.continuationString = continuationString;
 
-       l = 0;
-       Con_WordWidthFunc(&ti, NULL, &l, -1);
-       l = strlen(continuationString);
-       continuationWidth = (int) Con_WordWidthFunc(&ti, continuationString, &l, -1);
+       len = 0;
+       Con_WordWidthFunc(&ti, NULL, &len, -1);
+       len = strlen(continuationString);
+       continuationWidth = (int) Con_WordWidthFunc(&ti, continuationString, &len, -1);
 
        // first find the first line to draw by backwards iterating and word wrapping to find their length...
        startidx = CON_LINES_COUNT;
@@ -1856,7 +1856,6 @@ static int Con_LineHeight(int lineno)
        {
                float width = vid_conwidth.value;
                con_text_info_t ti;
-               con_lineinfo_t *li = &CON_LINES(lineno);
                ti.fontsize = con_textsize.value;
                ti.font = FONT_CONSOLE;
                li->height = COM_Wordwrap(li->start, li->len, 0, width, Con_WordWidthFunc, &ti, Con_CountLineFunc, NULL);
@@ -1976,7 +1975,7 @@ void Con_DrawConsole (int lines)
                conbackpic = scr_conbrightness.value >= 0.01f ? Draw_CachePic_Flags("gfx/conback", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0) : NULL;
                sx *= realtime; sy *= realtime;
                sx -= floor(sx); sy -= floor(sy);
-               if (conbackpic && conbackpic->tex != r_texture_notexture)
+               if (Draw_IsPicLoaded(conbackpic))
                        DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer,
                                        0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
                                        1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
@@ -1993,7 +1992,7 @@ void Con_DrawConsole (int lines)
                conbackpic = Draw_CachePic_Flags("gfx/conback2", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0);
                sx *= realtime; sy *= realtime;
                sx -= floor(sx); sy -= floor(sy);
-               if(conbackpic && conbackpic->tex != r_texture_notexture)
+               if(Draw_IsPicLoaded(conbackpic))
                        DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer,
                                        0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
                                        1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
@@ -2008,7 +2007,7 @@ void Con_DrawConsole (int lines)
                conbackpic = Draw_CachePic_Flags("gfx/conback3", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0);
                sx *= realtime; sy *= realtime;
                sx -= floor(sx); sy -= floor(sy);
-               if(conbackpic && conbackpic->tex != r_texture_notexture)
+               if(Draw_IsPicLoaded(conbackpic))
                        DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer,
                                        0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
                                        1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,