Factorized audio CD code

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index bb971ad4d46e9062e5447d559f9d9dc2f39d3316..a9661cff147a5c8e7f81997079ab47ffa59b596f 100644 (file)
--- a/console.c
+++ b/console.c
@@ -73,9 +73,6 @@ qboolean con_initialized;
 
 mempool_t *console_mempool;
 
-// scan lines to clear for notify lines
-int con_notifylines;
-
 extern void M_Menu_Main_f (void);
 
 /*
@@ -201,29 +198,32 @@ 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 (com_gamedir) < (MAXGAMEDIRLEN - strlen (t2)))
+               if (strlen (fs_gamedir) < (MAXGAMEDIRLEN - strlen (t2)))
                {
-                       sprintf (temp, "%s%s", com_gamedir, t2);
+                       sprintf (temp, "%s%s", fs_gamedir, t2);
                        unlink (temp);
                }
                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);
@@ -264,7 +264,7 @@ void Con_Linefeed (void)
 Con_Print
 
 Handles cursor positioning, line wrapping, etc
-All console printing must go through this in order to be logged to disk
+All console printing must go through this in order to be displayed
 If no console is visible, the notify window will pop up.
 ================
 */
@@ -319,7 +319,7 @@ void Con_Print (const char *txt)
                        {
                                if (con_notify.integer < 0)
                                        Cvar_SetValueQuick(&con_notify, 0);
-                               if (con_notifylines > MAX_NOTIFYLINES)
+                               if (con_notify.integer > MAX_NOTIFYLINES)
                                        Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
                                if (con_notify.integer > 0)
                                        con_times[con_current % con_notify.integer] = realtime;
@@ -355,16 +355,16 @@ void Con_Print (const char *txt)
 Con_DebugLog
 ================
 */
-void Con_DebugLog(const char *file, const char *fmt, ...)
+void Con_DebugLog (const char *msg)
 {
-    va_list argptr;
-    FILE* fd;
-
-    fd = fopen(file, "at");
-    va_start(argptr, fmt);
-    vfprintf (fd, fmt, argptr);
-    va_end(argptr);
-    fclose(fd);
+    qfile_t* file;
+
+    file = FS_Open ("qconsole.log", "at", true);
+       if (file)
+       {
+               FS_Printf (file, "%s", msg);
+               FS_Close (file);
+       }
 }
 
 
@@ -387,17 +387,12 @@ void Con_Printf (const char *fmt, ...)
        vsprintf (msg,fmt,argptr);
        va_end (argptr);
 
-// also echo to debugging console
+       // also echo to debugging console
        Sys_Printf ("%s", msg);
 
-// log all messages to file
+       // log all messages to file
        if (con_debuglog)
-       {
-               // can't use va() here because it might overwrite other important things
-               char logname[MAX_OSPATH];
-               sprintf(logname, "%s/qconsole.log", com_gamedir);
-               Con_DebugLog(logname, "%s", msg);
-       }
+               Con_DebugLog (msg);
 
        if (!con_initialized)
                return;
@@ -405,7 +400,7 @@ void Con_Printf (const char *fmt, ...)
        if (cls.state == ca_dedicated)
                return;         // no graphics mode
 
-// write it to the scrollable buffer
+       // write it to the scrollable buffer
        Con_Print (msg);
 }
 
@@ -520,7 +515,7 @@ void Con_DrawNotify (void)
 
        if (con_notify.integer < 0)
                Cvar_SetValueQuick(&con_notify, 0);
-       if (con_notifylines > MAX_NOTIFYLINES)
+       if (con_notify.integer > MAX_NOTIFYLINES)
                Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
        v = 0;
        for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++)
@@ -566,9 +561,6 @@ void Con_DrawNotify (void)
                        v += 8;
                }
        }
-
-       if (con_notifylines < v)
-               con_notifylines = v;
 }
 
 /*
@@ -579,7 +571,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)
 {
@@ -590,7 +581,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