reworked Image_HeightmapToNormalmap to use a somewhat blurrier but more consistent...

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index a911fb346fd6de24a57f7af1912593cffa637ce3..7a4c5c17ee7a4ef94510b5bb93e04816876b0c7e 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -216,7 +216,7 @@ qboolean host_stuffcmdsrun = false;
 void Cmd_StuffCmds_f (void)
 {
        int             i, j, l;
-       // this is per command, and bounds checked (no buffer overflows)
+       // this is for all commandline options combined (and is bounds checked)
        char    build[MAX_INPUTLINE];
 
        if (Cmd_Argc () != 1)
@@ -225,12 +225,17 @@ void Cmd_StuffCmds_f (void)
                return;
        }
 
+       // no reason to run the commandline arguments twice
+       if (host_stuffcmdsrun)
+               return;
+
        host_stuffcmdsrun = true;
+       build[0] = 0;
+       l = 0;
        for (i = 0;i < com_argc;i++)
        {
-               if (com_argv[i] && com_argv[i][0] == '+' && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
+               if (com_argv[i] && com_argv[i][0] == '+' && (com_argv[i][1] < '0' || com_argv[i][1] > '9') && l + strlen(com_argv[i]) - 1 <= sizeof(build) - 1)
                {
-                       l = 0;
                        j = 1;
                        while (com_argv[i][j])
                                build[l++] = com_argv[i][j++];
@@ -241,20 +246,24 @@ void Cmd_StuffCmds_f (void)
                                        continue;
                                if ((com_argv[i][0] == '+' || com_argv[i][0] == '-') && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
                                        break;
-                               if (l + strlen(com_argv[i]) + 5 > sizeof(build))
+                               if (l + strlen(com_argv[i]) + 4 > sizeof(build) - 1)
                                        break;
                                build[l++] = ' ';
-                               build[l++] = '\"';
+                               if (strchr(com_argv[i], ' '))
+                                       build[l++] = '\"';
                                for (j = 0;com_argv[i][j];j++)
                                        build[l++] = com_argv[i][j];
-                               build[l++] = '\"';
+                               if (strchr(com_argv[i], ' '))
+                                       build[l++] = '\"';
                        }
                        build[l++] = '\n';
-                       build[l++] = 0;
-                       Cbuf_InsertText (build);
                        i--;
                }
        }
+       // now terminate the combined string and prepend it to the command buffer
+       // we already reserved space for the terminator
+       build[l++] = 0;
+       Cbuf_InsertText (build);
 }
 
 
@@ -478,7 +487,8 @@ typedef struct cmd_function_s
        struct cmd_function_s *next;
        const char *name;
        const char *description;
-       xcommand_t function;
+       xcommand_t consolefunction;
+       xcommand_t clientfunction;
        qboolean csqcfunc;
 } cmd_function_t;
 
@@ -791,7 +801,7 @@ static void Cmd_TokenizeString (const char *text)
 Cmd_AddCommand
 ============
 */
-void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *description)
+void Cmd_AddCommand_WithClientCommand (const char *cmd_name, xcommand_t consolefunction, xcommand_t clientfunction, const char *description)
 {
        cmd_function_t *cmd;
        cmd_function_t *prev, *current;
@@ -808,7 +818,7 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *desc
        {
                if (!strcmp (cmd_name, cmd->name))
                {
-                       if (function)
+                       if (consolefunction || clientfunction)
                        {
                                Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
                                return;
@@ -823,9 +833,10 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *desc
 
        cmd = (cmd_function_t *)Mem_Alloc(cmd_mempool, sizeof(cmd_function_t));
        cmd->name = cmd_name;
-       cmd->function = function;
+       cmd->consolefunction = consolefunction;
+       cmd->clientfunction = clientfunction;
        cmd->description = description;
-       if(!function)                   //[515]: csqc
+       if(!consolefunction && !clientfunction)                 //[515]: csqc
                cmd->csqcfunc = true;
        cmd->next = cmd_functions;
 
@@ -840,6 +851,11 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *desc
        cmd->next = current;
 }
 
+void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *description)
+{
+       Cmd_AddCommand_WithClientCommand (cmd_name, function, NULL, description);
+}
+
 /*
 ============
 Cmd_Exists
@@ -1084,19 +1100,47 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src)
        {
                if (!strcasecmp (cmd_argv[0],cmd->name))
                {
-                       if(cmd->function && !cmd->csqcfunc)
-                               cmd->function ();
-                       else
-                               if(CL_VM_ConsoleCommand (text)) //[515]: csqc
-                                       return;
+                       if (cmd->csqcfunc && CL_VM_ConsoleCommand (text))       //[515]: csqc
+                               return;
+                       switch (src)
+                       {
+                       case src_command:
+                               if (cmd->consolefunction)
+                                       cmd->consolefunction ();
+                               else if (cmd->clientfunction)
+                               {
+                                       if (cls.state == ca_connected)
+                                       {
+                                               // forward remote commands to the server for execution
+                                               Cmd_ForwardToServer();
+                                       }
+                                       else
+                                               Con_Printf("Can not send command \"%s\", not connected.\n", Cmd_Argv(0));
+                               }
                                else
-                                       if(cmd->function)
-                                               cmd->function ();
-                       cmd_tokenizebufferpos = oldpos;
-                       return;
+                                       Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(0));
+                               cmd_tokenizebufferpos = oldpos;
+                               return;
+                       case src_client:
+                               if (cmd->clientfunction)
+                               {
+                                       cmd->clientfunction ();
+                                       cmd_tokenizebufferpos = oldpos;
+                                       return;
+                               }
+                               break;
+                       }
+                       break;
                }
        }
 
+       // if it's a client command and no command was found, say so.
+       if (cmd_source == src_client)
+       {
+               Con_Printf("player \"%s\" tried to %s\n", host_client->name, text);
+               return;
+       }
+
 // check alias
        for (a=cmd_alias ; a ; a=a->next)
        {