336

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 4cce82f93ff37ca399f66f85c227a0048e03419e..963d03db9de2bebed0ccd12f20f5dc887009a3dc 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);
@@ -419,7 +419,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 +447,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 +469,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 ("misc/talk.wav", true);
        // play talk wav
                txt++;
        }