S_LoadSound now automatically tries both with and without sound/ when loading sounds...

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 86301d24c6bf8aa932601d8dbf16babf53aac9c1..b5c3a14cd4eccc8a02e33006234794c160241e50 100644 (file)
--- a/console.c
+++ b/console.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // console.c
 
-#ifndef WIN32
+#if !defined(WIN32) || defined(__MINGW32__)
 # include <unistd.h>
 #endif
 #include <time.h>
@@ -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;
@@ -447,6 +455,9 @@ Con_Linefeed
 */
 void Con_Linefeed (void)
 {
+       if (con_backscroll)
+               con_backscroll++;
+
        con_x = 0;
        con_current++;
        memset (&con_text[(con_current%con_totallines)*con_linewidth], ' ', con_linewidth);
@@ -466,12 +477,10 @@ void Con_PrintToHistory(const char *txt)
        int y, c, l, mask;
        static int cr;
 
-       con_backscroll = 0;
-
        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++;
        }
@@ -679,6 +688,8 @@ Modified by EvilTypeGuy eviltypeguy@qeradiant.com
 */
 void Con_DrawInput (void)
 {
+       int             y;
+       int             i;
        char editlinecopy[257], *text;
 
        if (!key_consoleactive)
@@ -691,11 +702,17 @@ void Con_DrawInput (void)
        // use strlen of edit_line instead of key_linepos to allow editing
        // of early characters w/o erasing
 
+       y = strlen(text);
+
+// fill out remainder with spaces
+       for (i = y; i < 256; i++)
+               text[i] = ' ';
+
        // add the cursor frame
        if ((int)(realtime*con_cursorspeed) & 1)                // cursor is visible
                text[key_linepos] = 11 + 130 * key_insert;      // either solid or triangle facing right
 
-       text[key_linepos + 1] = 0;
+//     text[key_linepos + 1] = 0;
 
        // prestep if horizontally scrolling
        if (key_linepos >= con_linewidth)
@@ -705,7 +722,7 @@ void Con_DrawInput (void)
        DrawQ_String(0, con_vislines - 16, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
 
        // remove cursor
-       key_lines[edit_line][key_linepos] = 0;
+//     key_lines[edit_line][key_linepos] = 0;
 }