X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=console.c;h=95aaa5a17365239e09cdeab0cc70fa2bc3079595;hb=2d0166badbf099b5e992ba56a4f029fc390da0f2;hp=6b3545e854c99d2065ee39eebc1226a0d88d45e4;hpb=c29be2ab7e92f63b899fcc6ac5a2db1ac6707f12;p=xonotic%2Fdarkplaces.git

diff --git a/console.c b/console.c
index 6b3545e8..95aaa5a1 100644
--- a/console.c
+++ b/console.c
@@ -842,8 +842,23 @@ void Con_Clear_f(cmd_state_t *cmd)
 	if (con_mutex) Thread_UnlockMutex(con_mutex);
 }
 
-void Con_Init_Commands(void)
+/*
+================
+Con_Init
+================
+*/
+void Con_Init (void)
 {
+	con_linewidth = 80;
+	ConBuffer_Init(&con, CON_TEXTSIZE, CON_MAXLINES, zonemempool);
+	if (Thread_HasThreads())
+		con_mutex = Thread_CreateMutex();
+
+	// Allocate a log queue, this will be freed after configs are parsed
+	logq_size = MAX_INPUTLINE;
+	logqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size);
+	logq_ind = 0;
+
 	Cvar_RegisterVariable (&sys_colortranslation);
 	Cvar_RegisterVariable (&sys_specialcharactertranslation);
 
@@ -894,26 +909,10 @@ void Con_Init_Commands(void)
 	Cmd_AddCommand(CMD_SHARED, "maps", Con_Maps_f, "list information about available maps");
 	Cmd_AddCommand(CMD_SHARED, "condump", Con_ConDump_f, "output console history to a file (see also log_file)");
 
-}
-
-/*
-================
-Con_Init
-================
-*/
-void Con_Init (void)
-{
-	con_linewidth = 80;
-	ConBuffer_Init(&con, CON_TEXTSIZE, CON_MAXLINES, zonemempool);
-	if (Thread_HasThreads())
-		con_mutex = Thread_CreateMutex();
-
-	// Allocate a log queue, this will be freed after configs are parsed
-	logq_size = MAX_INPUTLINE;
-	logqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size);
-	logq_ind = 0;
-
 	con_initialized = true;
+	// initialize console window (only used by sys_win.c)
+	Sys_InitConsole();
+	
 	Con_DPrint("Console initialized.\n");
 }
 
@@ -2428,7 +2427,7 @@ static int Nicks_strncasecmp(char *a, char *b, unsigned int a_len)
  */
 static int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon)
 {
-	char name[128];
+	char name[MAX_SCOREBOARDNAME];
 	int i, p;
 	int match;
 	int spos;
@@ -2759,7 +2758,7 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos)
 		msg = Nicks_list[0];
 		len = min(size - Nicks_matchpos - 3, strlen(msg));
 		memcpy(&buffer[Nicks_matchpos], msg, len);
-		if( len < (size - 7) ) // space for color (^[0-9] or ^xrgb) and space and \0
+		if(len < size - 7) // space for color code (^[0-9] or ^xrgb), space and \0
 			len = (int)Nicks_AddLastColor(buffer, Nicks_matchpos+(int)len);
 		buffer[len++] = ' ';
 		buffer[len] = 0;
@@ -3073,7 +3072,7 @@ done:
 
 				memcpy(&key_line[key_linepos] , Nicks_list[0], cmd_len);
 				key_linepos += cmd_len;
-				if(key_linepos < (int)(sizeof(key_line)-4)) // space for ^, X and space and \0
+				if(key_linepos < (int)(sizeof(key_line) - 7)) // space for color code (^[0-9] or ^xrgb), space and \0
 					key_linepos = Nicks_AddLastColor(key_line, key_linepos);
 			}
 			key_line[key_linepos++] = ' ';