Added S_GetCached so the dedicated servers compiles now

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 21148248e1ccaf21ec9cc676e164f70877ca4ff1..a991bad28fbe09ce50a3e758be9d082ea2f9d455 100644 (file)
--- a/console.c
+++ b/console.c
@@ -201,20 +201,13 @@ void Con_CheckResize (void)
 }
 
 
-/*
-================
-Con_Init
-================
-*/
-void Con_Init (void)
+void Con_InitLogging (void)
 {
 #define MAXGAMEDIRLEN 1000
        char temp[MAXGAMEDIRLEN+1];
        char *t2 = "/qconsole.log";
 
-       Cvar_RegisterVariable(&logfile);
        con_debuglog = COM_CheckParm("-condebug");
-
        if (con_debuglog)
        {
                if (strlen (fs_gamedir) < (MAXGAMEDIRLEN - strlen (t2)))
@@ -224,6 +217,16 @@ void Con_Init (void)
                }
                logfile.integer = 1;
        }
+}
+
+/*
+================
+Con_Init
+================
+*/
+void Con_Init (void)
+{
+       Cvar_RegisterVariable(&logfile);
 
        console_mempool = Mem_AllocPool("console");
        con_text = Mem_Alloc(console_mempool, CON_TEXTSIZE);
@@ -574,7 +577,6 @@ Draws the console with the solid background
 The typing input line at the bottom should only be drawn if typing is allowed
 ================
 */
-extern cvar_t scr_conalpha;
 extern char engineversion[40];
 void Con_DrawConsole (int lines)
 {
@@ -585,7 +587,10 @@ void Con_DrawConsole (int lines)
                return;
 
 // draw the background
-       DrawQ_Pic(0, lines - vid.conheight, "gfx/conback", vid.conwidth, vid.conheight, 1, 1, 1, scr_conalpha.value * lines / vid.conheight, 0);
+       if (scr_conbrightness.value >= 0.01f)
+               DrawQ_Pic(0, lines - vid.conheight, "gfx/conback", vid.conwidth, vid.conheight, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0);
+       else
+               DrawQ_Fill(0, lines - vid.conheight, vid.conwidth, vid.conheight, 0, 0, 0, scr_conalpha.value, 0);
        DrawQ_String(vid.conwidth - strlen(engineversion) * 8 - 8, lines - 8, engineversion, 0, 8, 8, 1, 0, 0, 1, 0);
 
 // draw the text