X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=console.h;h=8ce079351f2b15d354fde1fb035001b8714e9285;hp=8d1a64a5823c80c8b26b176a0a972c366be36c70;hb=e179299248819faf4c25ac6e6360eb6d8246e3e7;hpb=1b5e3869f0fd3e2fe323680784610d48d6efddca

diff --git a/console.h b/console.h
index 8d1a64a5..8ce07935 100644
--- a/console.h
+++ b/console.h
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 1996-1997 Id Software, Inc.
+Copyright (C) 2000-2020 DarkPlaces contributors
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -21,14 +22,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
+#include <stddef.h>
+#include "qtypes.h"
+#include "cmd.h"
+#include "lhnet.h"
+
 //
 // console
 //
 extern int con_totallines;
 extern int con_backscroll;
-extern qboolean con_initialized;
+extern qbool con_initialized;
 
-void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean proquakeprotocol);
+void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qbool proquakeprotocol);
 void Con_Rcon_Redirect_End(void);
 void Con_Rcon_Redirect_Abort(void);
 
@@ -51,14 +57,6 @@ void Con_Print(const char *txt);
 /// Prints to all appropriate console targets.
 void Con_Printf(const char *fmt, ...) DP_FUNC_PRINTF(1);
 
-/// Prints warnings
-void Con_Warn(const char *msg);
-void Con_Warnf(const char *fmt, ...);
-
-/// Prints errors
-void Con_Error(const char *msg);
-void Con_Errorf(const char *fmt, ...);
-
 /// A Con_Print that only shows up if the "developer" cvar is set.
 void Con_DPrint(const char *msg);
 
@@ -71,15 +69,13 @@ void Con_DrawNotify (void);
 void Con_ClearNotify (void);
 void Con_ToggleConsole_f(cmd_state_t *cmd);
 
-int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos);
-
-qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength);
+qbool GetMapList (const char *s, char *completedname, int completednamebufferlength);
 
 /// wrapper function to attempt to either complete the command line
 /// or to list possible matches grouped by type
 /// (i.e. will display possible variables, aliases, commands
 /// that match what they've typed so far)
-void Con_CompleteCommandLine(cmd_state_t *cmd);
+int Con_CompleteCommandLine(cmd_state_t *cmd, qbool is_console);
 
 /// Generic libs/util/console.c function to display a list
 /// formatted in columns on the console
@@ -97,6 +93,9 @@ void Log_DestBuffer_Flush (void); ///< call this once per frame to send out repl
 void Log_Printf(const char *logfilename, const char *fmt, ...) DP_FUNC_PRINTF(2);
 //@}
 
+#define CON_WARN "^3"
+#define CON_ERROR "^1"
+
 // CON_MASK_PRINT is the default (Con_Print/Con_Printf)
 // CON_MASK_DEVELOPER is used by Con_DPrint/Con_DPrintf
 #define CON_MASK_HIDENOTIFY 128
@@ -119,7 +118,7 @@ con_lineinfo_t;
 
 typedef struct conbuffer_s
 {
-	qboolean active;
+	qbool active;
 	int textsize;
 	char *text;
 	int maxlines;