improved COM_ParseToken functions to continue parsing after the token

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index d0d2dd286ec5df682cd3f7d6d38c2ded64573e35..6e61c43895b961fef58c6e31435d040ccc79e919 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -510,7 +510,7 @@ static void
 Key_Message (int key, char ascii)
 {
 
-       if (key == K_ENTER)
+       if (key == K_ENTER || ascii == 10 || ascii == 13)
        {
                Cmd_ForwardStringToServer(va("%s %s", chat_team ? "say_team" : "say ", chat_buffer));
 
@@ -801,17 +801,21 @@ void
 Key_WriteBindings (qfile_t *f)
 {
        int         i, j;
+       char bindbuf[MAX_INPUTLINE];
+       const char *p;
 
        for (j = 0; j < MAX_BINDMAPS; j++)
        {
                for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
                {
-                       if (keybindings[j][i])
+                       p = keybindings[j][i];
+                       if (p)
                        {
+                               Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
                                if (j == 0)
-                                       FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), keybindings[j][i]);
+                                       FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf);
                                else
-                                       FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i), keybindings[j][i]);
+                                       FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
                        }
                }
        }