changed cl_movement_latency to be in milliseconds rather than seconds (less confusing...

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index e6127a24add11f59abc65bc35f388ef83a68d67b..aabc53ea1c313a211f2892bbc07569b00888f0f1 100644 (file)
--- a/console.c
+++ b/console.c
@@ -444,25 +444,11 @@ All console printing must go through this in order to be displayed
 If no console is visible, the notify window will pop up.
 ================
 */
-void Con_PrintToHistory(const char *txt)
+void Con_PrintToHistory(const char *txt, int mask)
 {
-       int y, c, l, mask;
+       int y, c, l;
        static int cr;
 
-       if (txt[0] == 1)
-       {
-               mask = 128;             // go to colored text
-               txt++;
-       }
-       else if (txt[0] == 2)
-       {
-               mask = 128;             // go to colored text
-               txt++;
-       }
-       else
-               mask = 0;
-
-
        while ( (c = *txt) )
        {
        // count word length
@@ -519,11 +505,6 @@ void Con_PrintToHistory(const char *txt)
                }
 
        }
-
-       if( txt[0] == 1 ) {
-               // play talk wav
-               S_LocalSound ("sound/misc/talk.wav");
-       }
 }
 
 /* The translation table between the graphical font and plain ASCII  --KB */
@@ -575,6 +556,7 @@ extern cvar_t timeformat;
 extern qboolean sys_nostdout;
 void Con_Print(const char *msg)
 {
+       int mask = 0;
        static int index = 0;
        static char line[16384];
 
@@ -587,7 +569,24 @@ void Con_Print(const char *msg)
                        // special color codes for chat messages must always come first
                        // for Con_PrintToHistory to work properly
                        if (*msg <= 2)
-                               line[index++] = *msg++;
+                       {
+                               if (*msg == 1)
+                               {
+                                       // play talk wav
+                                       S_LocalSound ("sound/misc/talk.wav");
+                               }
+                               if (gamemode == GAME_NEXUIZ)
+                               {
+                                       line[index++] = '^';
+                                       line[index++] = '3';
+                               }
+                               else
+                               {
+                                       // go to colored text
+                                       mask = 128;
+                               }
+                               msg++;
+                       }
                        // store timestamp
                        for (;*timestamp;index++, timestamp++)
                                if (index < sizeof(line) - 2)
@@ -602,9 +601,6 @@ void Con_Print(const char *msg)
                        line[index] = 0;
                        // send to log file
                        Log_ConPrint(line);
-                       // send to scrollable buffer
-                       if (con_initialized && cls.state != ca_dedicated)
-                               Con_PrintToHistory(line);
                        // send to terminal or dedicated server window
                        if (!sys_nostdout)
                        {
@@ -613,6 +609,9 @@ void Con_Print(const char *msg)
                                        *p = qfont_table[*p];
                                Sys_PrintToTerminal(line);
                        }
+                       // send to scrollable buffer
+                       if (con_initialized && cls.state != ca_dedicated)
+                               Con_PrintToHistory(line, mask);
                        // empty the line buffer
                        index = 0;
                }
@@ -689,14 +688,26 @@ DRAWING
 
 static vec4_t _con_colors[] =
 {
-       {1.0, 1.0, 1.0, 1.0},
-       {1.0, 0.0, 0.0, 1.0},
-       {0.0, 1.0, 0.0, 1.0},
-       {0.0, 0.0, 1.0, 1.0},
-       {1.0, 1.0, 0.0, 1.0},
-       {0.0, 1.0, 1.0, 1.0},
-       {1.0, 0.0, 1.0, 1.0},
-       {0.1, 0.1, 0.1, 1.0}
+       // Quake3 colors
+       // LordHavoc: why on earth is cyan before magenta in Quake3?
+       // LordHavoc: note: Doom3 uses white for [0] and [7]
+       {0.0, 0.0, 0.0, 1.0}, // black
+       {1.0, 0.0, 0.0, 1.0}, // red
+       {0.0, 1.0, 0.0, 1.0}, // green
+       {1.0, 1.0, 0.0, 1.0}, // yellow
+       {0.0, 0.0, 1.0, 1.0}, // blue
+       {0.0, 1.0, 1.0, 1.0}, // cyan
+       {1.0, 0.0, 1.0, 1.0}, // magenta
+       {1.0, 1.0, 1.0, 1.0}  // white
+       // Black's color table
+       //{1.0, 1.0, 1.0, 1.0},
+       //{1.0, 0.0, 0.0, 1.0},
+       //{0.0, 1.0, 0.0, 1.0},
+       //{0.0, 0.0, 1.0, 1.0},
+       //{1.0, 1.0, 0.0, 1.0},
+       //{0.0, 1.0, 1.0, 1.0},
+       //{1.0, 0.0, 1.0, 1.0},
+       //{0.1, 0.1, 0.1, 1.0}
 };
 
 #define _con_colors_count      (sizeof(_con_colors) / sizeof(vec3_t))
@@ -709,7 +720,7 @@ static void _Con_DrawString( float x, float y, const char *text, int maxlen, flo
        const char *first, *last;
        int len;
 
-       color = _con_colors[0];
+       color = _con_colors[7];
        if( maxlen < 1)
                len = strlen( text );
        else