particles: apply rotation so that in the initial display frame of the particle, the...

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 23c3fdb0822103b3c61c81e4763f2d399ef3b120..dd3137dd18aeaaaf0cf0ac06fee32603da44f532 100644 (file)
--- a/console.c
+++ b/console.c
@@ -1325,6 +1325,9 @@ Con_DPrint
 */
 void Con_DPrint(const char *msg)
 {
+       if(developer.integer < 0) // at 0, we still add to the buffer but hide
+               return;
+
        Con_MaskPrint(CON_MASK_DEVELOPER, msg);
 }
 
@@ -1338,6 +1341,9 @@ void Con_DPrintf(const char *fmt, ...)
        va_list argptr;
        char msg[MAX_INPUTLINE];
 
+       if(developer.integer < 0) // at 0, we still add to the buffer but hide
+               return;
+
        va_start(argptr,fmt);
        dpvsnprintf(msg,sizeof(msg),fmt,argptr);
        va_end(argptr);
@@ -1384,7 +1390,7 @@ void Con_DrawInput (void)
        y = (int)strlen(text);
 
        // append enoug nul-bytes to cover the utf8-versions of the cursor too
-       for (i = y; i < y + 4 && i < sizeof(editlinecopy); ++i)
+       for (i = y; i < y + 4 && i < (int)sizeof(editlinecopy); ++i)
                text[i] = 0;
 
        // add the cursor frame
@@ -1768,7 +1774,8 @@ The typing input line at the bottom should only be drawn if typing is allowed
 void Con_DrawConsole (int lines)
 {
        int mask_must = 0;
-       int mask_mustnot = developer.integer ? 0 : CON_MASK_DEVELOPER;
+       int mask_mustnot = (developer.integer>0) ? 0 : CON_MASK_DEVELOPER;
+       cachepic_t *conbackpic;
 
        if (lines <= 0)
                return;
@@ -1779,7 +1786,11 @@ void Con_DrawConsole (int lines)
        con_vislines = lines;
 
 // draw the background
-       DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic ("gfx/conback") : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, cls.signon == SIGNONS ? scr_conalpha.value : 1.0, 0); // always full alpha when not in game
+       conbackpic = scr_conbrightness.value >= 0.01f ? Draw_CachePic("gfx/conback") : NULL;
+       if (conbackpic && conbackpic->tex != r_texture_notexture)
+               DrawQ_Pic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, cls.signon == SIGNONS ? scr_conalpha.value : 1.0f, 0); // always full alpha when not in game
+       else
+               DrawQ_Fill(0, lines - vid_conheight.integer, vid_conwidth.integer, vid_conheight.integer, 0.0f, 0.0f, 0.0f, cls.signon == SIGNONS ? scr_conalpha.value : 1.0f, 0); // always full alpha when not in game
        DrawQ_String(vid_conwidth.integer - DrawQ_TextWidth(engineversion, 0, con_textsize.value, con_textsize.value, false, FONT_CONSOLE), lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true, FONT_CONSOLE);
 
 // draw the text
@@ -2166,7 +2177,6 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon)
 {
        char name[128];
        int i, p;
-       int length;
        int match;
        int spos;
        int count = 0;
@@ -2190,7 +2200,6 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon)
                if(!name[0])
                        continue;
 
-               length = strlen(name);
                match = -1;
                spos = pos - 1; // no need for a minimum of characters :)
 
@@ -2748,7 +2757,7 @@ void Con_CompleteCommandLine (void)
        a = Cmd_CompleteAliasCountPossible(s);
        if (a)
        {
-               Con_Printf("\n%i possible aliases%s\n", a, (a > 1) ? "s: " : ":");
+               Con_Printf("\n%i possible alias%s\n", a, (a > 1) ? "es: " : ":");
                Cmd_CompleteAliasPrint(s);
        }
        n = Nicks_CompleteCountPossible(key_line, key_linepos, s, true);