added DP_CON_SET and DP_CON_SETA extensions

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 142ef641020ada3623e0f650e3be5cc3b74e2e1d..d49bcd6a32e0129e588e6877a404ab691219df0f 100644 (file)
--- a/console.c
+++ b/console.c
@@ -97,7 +97,7 @@ const char* Log_Timestamp (const char *desc)
        // Build the time stamp (ex: "Wed Jun 30 21:49:08 1993");
        time (&crt_time);
        crt_tm = localtime (&crt_time);
-       strftime (timestring, sizeof (timestring), "%a %b %d %T %Y", crt_tm);
+       strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", crt_tm);
 
        if (desc != NULL)
                snprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring);
@@ -115,21 +115,22 @@ Log_Init
 */
 void Log_Init (void)
 {
+       // Allocate a log queue
+       logq_size = 512;
+       logqueue = Mem_Alloc (tempmempool, logq_size);
+       logq_ind = 0;
+
        Cvar_RegisterVariable (&log_file);
        Cvar_RegisterVariable (&log_sync);
 
        // support for the classic Quake option
+// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log with sync on (so it keeps every message up to a crash), see also log_file and log_sync
        if (COM_CheckParm ("-condebug") != 0)
        {
                Cvar_SetQuick (&log_file, "qconsole.log");
                Cvar_SetValueQuick (&log_sync, 1);
                unlink (va("%s/qconsole.log", fs_gamedir));
        }
-
-       // Allocate a log queue
-       logq_size = 512;
-       logqueue = Mem_Alloc (tempmempool, logq_size);
-       logq_ind = 0;
 }
 
 
@@ -200,6 +201,11 @@ Log_ConPrint
 */
 void Log_ConPrint (const char *msg)
 {
+       static qboolean inprogress = false;
+       // don't allow feedback loops with memory error reports
+       if (inprogress)
+               return;
+       inprogress = true;
        // Until the host is completely initialized, we maintain a log queue
        // to store the messages, since the log can't be started before
        if (logqueue != NULL)
@@ -223,6 +229,7 @@ void Log_ConPrint (const char *msg)
                memcpy (&logqueue[logq_ind], msg, len);
                logq_ind += len;
 
+               inprogress = false;
                return;
        }
 
@@ -240,6 +247,7 @@ void Log_ConPrint (const char *msg)
                if (log_sync.integer)
                        FS_Flush (logfile);
        }
+       inprogress = false;
 }
 
 
@@ -419,7 +427,7 @@ Con_Init
 */
 void Con_Init (void)
 {
-       console_mempool = Mem_AllocPool("console");
+       console_mempool = Mem_AllocPool("console", 0, NULL);
        con_text = Mem_Alloc(console_mempool, CON_TEXTSIZE);
        memset (con_text, ' ', CON_TEXTSIZE);
        con_linewidth = -1;
@@ -472,7 +480,7 @@ void Con_PrintToHistory(const char *txt)
        if (txt[0] == 1)
        {
                mask = 128;             // go to colored text
-               S_LocalSound ("misc/talk.wav");
+               S_LocalSound ("sound/misc/talk.wav");
        // play talk wav
                txt++;
        }
@@ -754,8 +762,6 @@ void Con_DrawNotify (void)
                        continue;
                text = con_text + (i % con_totallines)*con_linewidth;
 
-               clearnotify = 0;
-
                DrawQ_String(0, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
 
                v += 8;
@@ -764,8 +770,6 @@ void Con_DrawNotify (void)
 
        if (key_dest == key_message)
        {
-               clearnotify = 0;
-
                x = 0;
 
                // LordHavoc: speedup, and other improvements