X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=console.h;h=860c501eebfe3b89a0901842426e89ef72326915;hb=086c6c4f1ccdafa4e305eb0903f5570361594c20;hp=10009bf145008edeebb529447147ff094795991e;hpb=c72641f5e795ed0e0d58a38d79860cc92597e4da;p=xonotic%2Fdarkplaces.git

diff --git a/console.h b/console.h
index 10009bf1..860c501e 100644
--- a/console.h
+++ b/console.h
@@ -28,9 +28,9 @@ extern int con_totallines;
 extern int con_backscroll;
 extern qboolean con_initialized;
 
-void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest);
-void Con_Rcon_Redirect_End();
-void Con_Rcon_Redirect_Abort();
+void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean proquakeprotocol);
+void Con_Rcon_Redirect_End(void);
+void Con_Rcon_Redirect_Abort(void);
 
 /// If the line width has changed, reformat the buffer.
 void Con_CheckResize (void);
@@ -39,6 +39,12 @@ void Con_Init_Commands (void);
 void Con_Shutdown (void);
 void Con_DrawConsole (int lines);
 
+/// Prints to a chosen console target
+void Con_MaskPrint(int mask, const char *msg);
+
+// Prints to a chosen console target
+void Con_MaskPrintf(int mask, const char *fmt, ...) DP_FUNC_PRINTF(2);
+
 /// Prints to all appropriate console targets, and adds timestamps
 void Con_Print(const char *txt);
 
@@ -57,6 +63,8 @@ void Con_DrawNotify (void);
 void Con_ClearNotify (void);
 void Con_ToggleConsole_f (void);
 
+int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos);
+
 qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength);
 
 /// wrapper function to attempt to either complete the command line
@@ -81,9 +89,13 @@ 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);
 //@}
 
+// 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
 #define CON_MASK_CHAT 1
 #define CON_MASK_INPUT 2
+#define CON_MASK_DEVELOPER 4
+#define CON_MASK_PRINT 8
 
 typedef struct con_lineinfo_s
 {
@@ -99,6 +111,7 @@ con_lineinfo_t;
 
 typedef struct conbuffer_s
 {
+	qboolean active;
 	int textsize;
 	char *text;
 	int maxlines;