added cl_particles_blood_size_min, cl_particles_blood_size_max, and cl_particles_bloo...

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index e99181e93e3f826ce27a8018852223efca509667..5d424f663a9961cef603d3b6b8a2c7b6b09d34f1 100644 (file)
--- a/console.c
+++ b/console.c
@@ -93,8 +93,8 @@ void Con_ToggleConsole_f (void)
        }
        else
                key_dest = key_console;
-       
-//     SCR_EndLoadingPlaque ();
+
+       SCR_EndLoadingPlaque ();
        memset (con_times, 0, sizeof(con_times));
 }
 
@@ -109,7 +109,7 @@ void Con_Clear_f (void)
                memset (con_text, ' ', CON_TEXTSIZE);
 }
 
-                                               
+
 /*
 ================
 Con_ClearNotify
@@ -118,12 +118,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 +137,7 @@ void Con_MessageMode_f (void)
        team_message = false;
 }
 
-                                               
+
 /*
 ================
 Con_MessageMode2_f
@@ -149,7 +149,7 @@ void Con_MessageMode2_f (void)
        team_message = true;
 }
 
-                                               
+
 /*
 ================
 Con_CheckResize
@@ -186,7 +186,7 @@ void Con_CheckResize (void)
                        numlines = con_totallines;
 
                numchars = oldwidth;
-       
+
                if (con_linewidth < numchars)
                        numchars = con_linewidth;
 
@@ -240,7 +240,7 @@ void Con_Init (void)
        memset (con_text, ' ', CON_TEXTSIZE);
        con_linewidth = -1;
        Con_CheckResize ();
-       
+
        Con_Printf ("Console initialized.\n");
 
 //
@@ -322,7 +322,7 @@ void Con_Print (char *txt)
                        cr = false;
                }
 
-               
+
                if (!con_x)
                {
                        Con_Linefeed ();
@@ -350,7 +350,7 @@ void Con_Print (char *txt)
                                con_x = 0;
                        break;
                }
-               
+
        }
 }
 
@@ -362,10 +362,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);
@@ -390,27 +390,32 @@ void Con_Printf (char *fmt, ...)
        va_list         argptr;
        char            msg[MAXPRINTMSG];
 //     static qboolean inupdate;
-       
+
        va_start (argptr,fmt);
        vsprintf (msg,fmt,argptr);
        va_end (argptr);
-       
+
 // also echo to debugging console
        Sys_Printf ("%s", msg);
 
 // log all messages to file
        if (con_debuglog)
-               Con_DebugLog(va("%s/qconsole.log",com_gamedir), "%s", msg);
+       {
+               // can't use va() here because it might overwrite other important things
+               char logname[MAX_OSPATH];
+               sprintf(logname, "%s/qconsole.log", com_gamedir);
+               Con_DebugLog(logname, "%s", msg);
+       }
 
        if (!con_initialized)
                return;
-               
+
        if (cls.state == ca_dedicated)
                return;         // no graphics mode
 
 // 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
        /*
@@ -448,7 +453,7 @@ void Con_DPrintf (char *fmt, ...)
        va_start (argptr,fmt);
        vsprintf (msg,fmt,argptr);
        va_end (argptr);
-       
+
        Con_Printf ("%s", msg);
 }
 
@@ -464,16 +469,16 @@ void Con_SafePrintf (char *fmt, ...)
 {
        va_list         argptr;
        char            msg[1024];
-       int                     temp;
-               
+       //int                   temp;
+
        va_start (argptr,fmt);
        vsprintf (msg,fmt,argptr);
        va_end (argptr);
 
-       temp = scr_disabled_for_loading;
-       scr_disabled_for_loading = true;
+       //temp = scr_disabled_for_loading;
+       //scr_disabled_for_loading = true;
        Con_Printf ("%s", msg);
-       scr_disabled_for_loading = temp;
+       //scr_disabled_for_loading = temp;
 }
 
 
@@ -702,10 +707,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);
@@ -749,18 +754,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;