you can now open/close the console independently of menu and messagemode

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 9466571faf13b1243a62bc3045d69e78a2575a88..6600491196b29dd49a8733f6691d43812643fd25 100644 (file)
--- a/console.c
+++ b/console.c
@@ -39,8 +39,6 @@ float         con_cursorspeed = 4;
 
 #define                CON_TEXTSIZE    16384
 
-qboolean       con_forcedup;           // because no entities to refresh
-
 int                    con_totallines;         // total lines in console scrollback
 int                    con_backscroll;         // lines up from bottom to display
 int                    con_current;            // where next message will be printed
@@ -80,16 +78,7 @@ Con_ToggleConsole_f
 */
 void Con_ToggleConsole_f (void)
 {
-       if (key_dest == key_console)
-       {
-               if (cls.state == ca_connected)
-                       key_dest = key_game;
-               else
-                       M_Menu_Main_f ();
-       }
-       else
-               key_dest = key_console;
-
+       key_consoleactive = !key_consoleactive;
        memset (con_times, 0, sizeof(con_times));
 }
 
@@ -473,7 +462,7 @@ void Con_DrawInput (void)
 {
        char editlinecopy[256], *text;
 
-       if (key_dest != key_console && !con_forcedup)
+       if (!key_consoleactive)
                return;         // don't draw anything
 
        text = strcpy(editlinecopy, key_lines[edit_line]);