Serious-Sam style crosshair (an actual sprite in the world, with slight variation...

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index c5332a9931c76cdbf7cd371eed190e021ea93bf7..14dcb7dcc27ee89704dbb1d45f475f692b280ae7 100644 (file)
--- a/console.c
+++ b/console.c
@@ -83,18 +83,13 @@ void Con_ToggleConsole_f (void)
        if (key_dest == key_console)
        {
                if (cls.state == ca_connected)
-//             {
                        key_dest = key_game;
-//                     key_lines[edit_line][1] = 0;    // clear any typing
-//                     key_linepos = 1;
-//             }
                else
                        M_Menu_Main_f ();
        }
        else
                key_dest = key_console;
-       
-//     SCR_EndLoadingPlaque ();
+
        memset (con_times, 0, sizeof(con_times));
 }
 
@@ -109,7 +104,7 @@ void Con_Clear_f (void)
                memset (con_text, ' ', CON_TEXTSIZE);
 }
 
-                                               
+
 /*
 ================
 Con_ClearNotify
@@ -118,12 +113,12 @@ Con_ClearNotify
 void Con_ClearNotify (void)
 {
        int             i;
-       
+
        for (i=0 ; i<NUM_CON_TIMES ; i++)
                con_times[i] = 0;
 }
 
-                                               
+
 /*
 ================
 Con_MessageMode_f
@@ -137,7 +132,7 @@ void Con_MessageMode_f (void)
        team_message = false;
 }
 
-                                               
+
 /*
 ================
 Con_MessageMode2_f
@@ -149,7 +144,7 @@ void Con_MessageMode2_f (void)
        team_message = true;
 }
 
-                                               
+
 /*
 ================
 Con_CheckResize
@@ -186,7 +181,7 @@ void Con_CheckResize (void)
                        numlines = con_totallines;
 
                numchars = oldwidth;
-       
+
                if (con_linewidth < numchars)
                        numchars = con_linewidth;
 
@@ -322,7 +317,7 @@ void Con_Print (char *txt)
                        cr = false;
                }
 
-               
+
                if (!con_x)
                {
                        Con_Linefeed ();
@@ -350,7 +345,7 @@ void Con_Print (char *txt)
                                con_x = 0;
                        break;
                }
-               
+
        }
 }
 
@@ -362,10 +357,10 @@ Con_DebugLog
 */
 void Con_DebugLog(char *file, char *fmt, ...)
 {
-    va_list argptr; 
+    va_list argptr;
     static char data[1024];
     int fd;
-    
+
     va_start(argptr, fmt);
     vsprintf(data, fmt, argptr);
     va_end(argptr);
@@ -389,7 +384,6 @@ void Con_Printf (char *fmt, ...)
 {
        va_list         argptr;
        char            msg[MAXPRINTMSG];
-//     static qboolean inupdate;
 
        va_start (argptr,fmt);
        vsprintf (msg,fmt,argptr);
@@ -415,24 +409,6 @@ void Con_Printf (char *fmt, ...)
 
 // write it to the scrollable buffer
        Con_Print (msg);
-
-// update the screen if the console is displayed
-       // LordHavoc: I don't think there's a real need for this
-       /*
-       // LordHavoc: don't print text while loading scripts
-       if (cls.state != ca_disconnected)
-       if (cls.signon != SIGNONS && !scr_disabled_for_loading )
-       {
-       // protect against infinite loop if something in SCR_UpdateScreen calls
-       // Con_Printf
-               if (!inupdate)
-               {
-                       inupdate = true;
-                       SCR_UpdateScreen ();
-                       inupdate = false;
-               }
-       }
-       */
 }
 
 /*
@@ -453,7 +429,7 @@ void Con_DPrintf (char *fmt, ...)
        va_start (argptr,fmt);
        vsprintf (msg,fmt,argptr);
        va_end (argptr);
-       
+
        Con_Printf ("%s", msg);
 }
 
@@ -469,16 +445,12 @@ void Con_SafePrintf (char *fmt, ...)
 {
        va_list         argptr;
        char            msg[1024];
-       int                     temp;
-               
+
        va_start (argptr,fmt);
        vsprintf (msg,fmt,argptr);
        va_end (argptr);
 
-       temp = scr_disabled_for_loading;
-       scr_disabled_for_loading = true;
        Con_Printf ("%s", msg);
-       scr_disabled_for_loading = temp;
 }
 
 
@@ -707,10 +679,10 @@ Con_CompleteCommandLine (void)
        c = Cmd_CompleteCountPossible(s);
        v = Cvar_CompleteCountPossible(s);
        a = Cmd_CompleteAliasCountPossible(s);
-       
+
        if (!(c + v + a))       // No possible matches
                return;
-       
+
        if (c + v + a == 1) {
                if (c)
                        list[0] = Cmd_CompleteBuildList(s);
@@ -754,18 +726,18 @@ Con_CompleteCommandLine (void)
                        Con_Printf("%i possible command%s\n", c, (c > 1) ? "s: " : ":");
                        Con_DisplayList(list[0]);
                }
-               
+
                if (v) {
                        Con_Printf("%i possible variable%s\n", v, (v > 1) ? "s: " : ":");
                        Con_DisplayList(list[1]);
                }
-               
+
                if (a) {
                        Con_Printf("%i possible aliases%s\n", a, (a > 1) ? "s: " : ":");
                        Con_DisplayList(list[2]);
                }
        }
-       
+
        if (cmd) {
                strncpy(key_lines[edit_line] + 1, cmd, cmd_len);
                key_linepos = cmd_len + 1;