Merge branch 'master' into Cloudwalk/Host_Init-overhaul

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index ad20495cd9e47df86eb7f5e54fb0b386d42497e6..a84fa6ae52e5973c996b0348191ebe754f3d9f5b 100644 (file)
--- a/console.c
+++ b/console.c
@@ -873,18 +873,26 @@ void Con_Init (void)
        logqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size);
        logq_ind = 0;
 
+       // support for the classic Quake option
+// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log, see also log_file
+       if (Sys_CheckParm ("-condebug") != 0)
+               Cvar_SetQuick (&log_file, "qconsole.log");
+
+       con_initialized = true;
+       // initialize console window (only used by sys_win.c)
+       Sys_InitConsole();
+       
+       Con_Print("Console initialized.\n");
+}
+
+void Con_Init_Commands(void)
+{
        Cvar_RegisterVariable (&sys_colortranslation);
        Cvar_RegisterVariable (&sys_specialcharactertranslation);
 
        Cvar_RegisterVariable (&log_file);
        Cvar_RegisterVariable (&log_file_stripcolors);
        Cvar_RegisterVariable (&log_dest_udp);
-
-       // support for the classic Quake option
-// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log, see also log_file
-       if (Sys_CheckParm ("-condebug") != 0)
-               Cvar_SetQuick (&log_file, "qconsole.log");
-
        // register our cvars
        Cvar_RegisterVariable (&con_chat);
        Cvar_RegisterVariable (&con_chatpos);
@@ -928,12 +936,6 @@ void Con_Init (void)
        Cmd_AddCommand(CF_SHARED, "clear", Con_Clear_f, "clear console history");
        Cmd_AddCommand(CF_SHARED, "maps", Con_Maps_f, "list information about available maps");
        Cmd_AddCommand(CF_SHARED, "condump", Con_ConDump_f, "output console history to a file (see also log_file)");
-
-       con_initialized = true;
-       // initialize console window (only used by sys_win.c)
-       Sys_InitConsole();
-       
-       Con_Print("Console initialized.\n");
 }
 
 void Con_Shutdown (void)