initial work for DETACHED signatures

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index c76e303f89e1f1e09f687b7e9d5367e896d131f7..87663328ece11b31d9580e3c74662ed96e263b6a 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -224,7 +224,7 @@ static void Key_History_Find_Backwards(void)
        for ( ; i >= 0; i--)
                if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
                {
-                       Con_Printf("^2%*i^7 %s\n", digits, i+1, ConBuffer_GetLine(&history, i));
+                       Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
                        history_line = i;
                        history_matchfound = true;
                        return;
@@ -255,7 +255,7 @@ static void Key_History_Find_Forwards(void)
        for ( ; i < CONBUFFER_LINES_COUNT(&history); i++)
                if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
                {
-                       Con_Printf("^2%*i^7 %s\n", digits, i+1, ConBuffer_GetLine(&history, i));
+                       Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
                        history_line = i;
                        history_matchfound = true;
                        return;
@@ -277,7 +277,7 @@ static void Key_History_Find_All(void)
        for (i=0; i<CONBUFFER_LINES_COUNT(&history); i++)
                if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
                {
-                       Con_Printf("%s%*i^7 %s\n", (i == history_line) ? "^2" : "^3", digits, i+1, ConBuffer_GetLine(&history, i));
+                       Con_Printf("%s%*i^7 %s\n", (i == history_line) ? "^2" : "^3", (int)digits, i+1, ConBuffer_GetLine(&history, i));
                        count++;
                }
        Con_Printf("%i result%s\n\n", count, (count != 1) ? "s" : "");
@@ -304,7 +304,7 @@ static void Key_History_f(void)
        }
 
        for ( ; i<CONBUFFER_LINES_COUNT(&history); i++)
-               Con_Printf("^3%*i^7 %s\n", digits, i+1, ConBuffer_GetLine(&history, i));
+               Con_Printf("^3%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
        Con_Printf("\n");
 }
 
@@ -1203,7 +1203,7 @@ Key_Message (int key, int ascii)
        }
 
        // ctrl+key generates an ascii value < 32 and shows a char from the charmap
-       if (ascii < 32 && utf8_enable.integer)
+       if (ascii > 0 && ascii < 32 && utf8_enable.integer)
                ascii = 0xE000 + ascii;
 
        if (chat_bufferlen == sizeof (chat_buffer) - 1)
@@ -1887,7 +1887,10 @@ Key_Event (int key, int ascii, qboolean down)
        // ignore binds while a video is played, let the video system handle the key event
        if (cl_videoplaying)
        {
-               CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
+               if (gamemode == GAME_BLOODOMNICIDE) // menu controls key events
+                       MR_KeyEvent(key, ascii, down);
+               else
+                       CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
                return;
        }