int con_current;
// offset in current line for next print
int con_x;
-char *con_text = 0;
+char con_text[CON_TEXTSIZE];
//seconds
cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3"};
qboolean con_initialized;
-mempool_t *console_mempool;
-
/*
==============================================================================
if (logfile != NULL || log_file.string[0] == '\0')
return;
- logfile = FS_Open (log_file.string, "ab", false);
+ logfile = FS_Open (log_file.string, "ab", false, false);
if (logfile != NULL)
{
strlcpy (crt_log_file, log_file.string, sizeof (crt_log_file));
{
qfile_t *file;
- file = FS_Open (logfilename, "ab", true);
+ file = FS_Open (logfilename, "ab", true, false);
if (file != NULL)
{
va_list argptr;
*/
void Con_Init (void)
{
- console_mempool = Mem_AllocPool("console", 0, NULL);
- con_text = Mem_Alloc(console_mempool, CON_TEXTSIZE);
memset (con_text, ' ', CON_TEXTSIZE);
con_linewidth = -1;
Con_CheckResize ();
int y, c, l, mask;
static int cr;
- if (txt[0] == 1)
+ if (txt[0] == 1 || txt[0] == 2)
{
- mask = 128; // go to colored text
- S_LocalSound ("sound/misc/talk.wav");
- // play talk wav
- txt++;
- }
- else if (txt[0] == 2)
- {
- mask = 128; // go to colored text
+ if (gamemode == GAME_NEXUIZ)
+ mask = 0;
+ else
+ mask = 128; // go to colored text
txt++;
}
else
}
}
+
+ if( txt[0] == 1 ) {
+ // play talk wav
+ S_LocalSound ("sound/misc/talk.wav");
+ }
}
/* The translation table between the graphical font and plain ASCII --KB */
// special color codes for chat messages must always come first
// for Con_PrintToHistory to work properly
if (*msg <= 2)
- line[index++] = *msg++;
+ {
+ if (gamemode == GAME_NEXUIZ)
+ {
+ line[index++] = '^';
+ line[index++] = '3';
+ msg++;
+ }
+ else
+ line[index++] = *msg++;
+ }
// store timestamp
for (;*timestamp;index++, timestamp++)
if (index < sizeof(line) - 2)
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))
const char *first, *last;
int len;
- color = _con_colors[0];
+ color = _con_colors[7];
if( maxlen < 1)
len = strlen( text );
else
// iterate until we get the next color tag or reach the end of the text part to draw
for( ; len && *last != _con_color_tag ; len--, last++ )
;
- // dont do anything if we havent read anything yet
- if( last != text ) {
+ // only draw the partial string if we have read anything
+ if( last != first ) {
// draw the string
DrawQ_String( x, y, first, last - first, scalex, scaley, color[0], color[1], color[2], color[3], flags );
// update x to be at the new start position
color = _con_colors[index];
// we dont want to display the color tag and the color index
first = last;
- }
+ }
}
}
rows = (lines-16)>>3; // rows of text to draw
y = lines - 16 - (rows<<3); // may start slightly negative
-
+
for (i = con_current - rows + 1;i <= con_current;i++, y += 8)
{
j = max(i - con_backscroll, 0);