Overhaul to console structure, a bit

Quake/console.hpp

@@ -23,47 +23,62 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef __CONSOLE_H
 #define __CONSOLE_H
 
-//
-// console
-//
-extern int con_totallines;
-extern int con_backscroll;
-extern	bool con_forcedup;	// because no entities to refresh
-extern bool con_initialized;
-extern byte *con_chars;
-
 extern char con_lastcenterstring[]; //johnfitz
 
-void Con_DrawCharacter (int cx, int line, int num);
+void Con_DrawCharacter(int cx, int line, int num);
 
-void Con_CheckResize (void);
-void Con_Init (void);
-void Con_DrawConsole (int lines, bool drawinput);
-void Con_Printf (const char *fmt, ...) FUNC_PRINTF(1,2);
-void Con_DWarning (const char *fmt, ...) FUNC_PRINTF(1,2); //ericw
-void Con_Warning (const char *fmt, ...) FUNC_PRINTF(1,2); //johnfitz
-void Con_DPrintf (const char *fmt, ...) FUNC_PRINTF(1,2);
-void Con_DPrintf2 (const char *fmt, ...) FUNC_PRINTF(1,2); //johnfitz
-void Con_SafePrintf (const char *fmt, ...) FUNC_PRINTF(1,2);
-void Con_DrawNotify (void);
-void Con_ClearNotify (void);
-void Con_ToggleConsole_f (void);
+namespace console {
+    extern int total_lines;
+    extern int back_scroll;
+    extern bool forced_up;
+    extern bool initialized;
 
-void Con_NotifyBox (const char *text);	// during startup for sound / cd warnings
+    void init();
 
-void Con_Show (void);
-void Con_Hide (void);
+    void line_feed();
 
-const char *Con_Quakebar (int len);
-void Con_TabComplete (void);
-void Con_LogCenterPrint (const char *str);
+    void info(const char *fmt, ...);
+
+    void warn(const char *fmt, ...);
+
+    void dev_warn(const char *fmt, ...);
+
+    void debug(const char *fmt, ...);
+
+    void trace(const char *fmt, ...);
+
+    void safe_print(const char *fmt, ...);
+
+    void toggle_console();
+}
+
+void Con_CheckResize(void);
+
+void Con_DrawConsole(int lines, bool drawinput);
+
+void Con_DrawNotify(void);
+
+void Con_ClearNotify(void);
+
+void Con_NotifyBox(const char *text); // during startup for sound / cd warnings
+
+void Con_Show(void);
+
+void Con_Hide(void);
+
+const char *Con_Quakebar(int len);
+
+void Con_TabComplete(void);
+
+void Con_LogCenterPrint(const char *str);
 
 //
 // debuglog
 //
-void LOG_Init (quakeparms_t *parms);
-void LOG_Close (void);
-void Con_DebugLog (const char *msg);
+void LOG_Init(quakeparms_t *parms);
+
+void LOG_Close(void);
+
+void Con_DebugLog(const char *msg);
 
 #endif	/* __CONSOLE_H */
-