diff --git a/include/console.h b/include/console.h index 4a6dacf99..96c98dc7f 100644 --- a/include/console.h +++ b/include/console.h @@ -62,6 +62,7 @@ void Con_CheckResize (void); void Con_Init (void); void Con_Init_Cvars (void); void Con_DrawConsole (int lines); +void Con_DrawDownload (int lines); void Con_Print (char *txt); void Con_Printf (char *fmt, ...) __attribute__((format(printf,1,2))); void Con_DPrintf (char *fmt, ...) __attribute__((format(printf,1,2))); diff --git a/nq/source/console.c b/nq/source/console.c index 1c7d423ff..7d4f67d23 100644 --- a/nq/source/console.c +++ b/nq/source/console.c @@ -579,3 +579,8 @@ Con_DrawConsole (int lines) Con_DrawInput (); } +void +Con_DrawDownload (int lines) +{ +} + diff --git a/qw/source/console.c b/qw/source/console.c index 42c2486f7..f46c55529 100644 --- a/qw/source/console.c +++ b/qw/source/console.c @@ -533,11 +533,10 @@ Con_DrawNotify (void) void Con_DrawConsole (int lines) { - int i, j, x, y, n; + int i, x, y; int rows; char *text; int row; - char dlbar[1024]; if (lines <= 0) return; @@ -576,6 +575,17 @@ Con_DrawConsole (int lines) Draw_Character8 ((x + 1) << 3, y, text[x]); } +// draw the input prompt, user text, and cursor if desired + Con_DrawInput (); +} + +void +Con_DrawDownload (int lines) +{ + int i, j, x, y, n; + char *text; + char dlbar[1024]; + // draw the download bar // figure out width if (cls.download) { @@ -615,10 +625,9 @@ Con_DrawConsole (int lines) " %02d%%", cls.downloadpercent); // draw it - y = con_vislines - 22 + 8; + y = lines - 22 + 8; for (i = 0; i < strlen (dlbar); i++) Draw_Character8 ((i + 1) << 3, y, dlbar[i]); } -// draw the input prompt, user text, and cursor if desired - Con_DrawInput (); } + diff --git a/qw/source/gl_screen.c b/qw/source/gl_screen.c index 3655ad0a8..b40c20b21 100644 --- a/qw/source/gl_screen.c +++ b/qw/source/gl_screen.c @@ -616,6 +616,7 @@ SCR_DrawConsole (void) if (scr_con_current) { scr_copyeverything = 1; Con_DrawConsole (scr_con_current); + Con_DrawDownload (scr_con_current); clearconsole = 0; } else { if (key_dest == key_game || key_dest == key_message) diff --git a/qw/source/screen.c b/qw/source/screen.c index 5ba93c74e..5ea277eb0 100644 --- a/qw/source/screen.c +++ b/qw/source/screen.c @@ -631,6 +631,7 @@ SCR_DrawConsole (void) if (scr_con_current) { scr_copyeverything = 1; Con_DrawConsole (scr_con_current); + Con_DrawDownload (scr_con_current); clearconsole = 0; } else { if (key_dest == key_game || key_dest == key_message)