increased sv_maxrate limit to 150000 from 25000

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index de0a77209a6e0e85d4dd55b17e01dc57b6415ace..b042cd28b3de7cccffaacb127bb2ad099d1f7db3 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -386,6 +386,7 @@ typedef struct cmd_function_s
 {
        struct cmd_function_s *next;
        const char *name;
+       const char *description;
        xcommand_t function;
        qboolean csqcfunc;
 } cmd_function_t;
@@ -435,7 +436,8 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma
                                outtext[outlen++] = *in++;
                        } else if( *in == '*' && alias ) {
                                const char *linein = Cmd_Args();
-                               // include all params
+
+                               // include all parameters
                                if (linein) {
                                        while( *linein && outlen < maxoutlen ) {
                                                outtext[outlen++] = *linein++;
@@ -471,7 +473,11 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma
                                        }
                                        in = tempin;
                                } else {
-                                       Con_Printf( "Warning: could not find cvar %s when expanding alias %s\n    %s\n", com_token, alias->name, alias->value );
+                                       if( alias ) {
+                                               Con_Printf( "Warning: could not find cvar %s when expanding alias %s\n    %s\n", com_token, alias->name, alias->value );
+                                       } else {
+                                               Con_Printf( "Warning: could not find cvar %s\n", com_token );
+                                       }
                                        outtext[outlen++] = '$';
                                }
                        }
@@ -496,7 +502,9 @@ static void Cmd_ExecuteAlias (cmdalias_t *alias)
 {
        static char buffer[ MAX_INPUTLINE + 2 ];
        Cmd_PreprocessString( alias->value, buffer, sizeof(buffer) - 2, alias );
-       Cbuf_AddText( buffer );
+       // insert at start of command buffer, so that aliases execute in order
+       // (fixes bug introduced by Black on 20050705)
+       Cbuf_InsertText( buffer );
 }
 
 /*
@@ -530,7 +538,7 @@ static void Cmd_List_f (void)
        {
                if (partial && strncmp(partial, cmd->name, len))
                        continue;
-               Con_Printf("%s\n", cmd->name);
+               Con_Printf("%s : %s\n", cmd->name, cmd->description);
                count++;
        }
 
@@ -559,17 +567,19 @@ void Cmd_Init_Commands (void)
 //
 // register our commands
 //
-       Cmd_AddCommand ("stuffcmds",Cmd_StuffCmds_f);
-       Cmd_AddCommand ("exec",Cmd_Exec_f);
-       Cmd_AddCommand ("echo",Cmd_Echo_f);
-       Cmd_AddCommand ("alias",Cmd_Alias_f);
-       Cmd_AddCommand ("cmd", Cmd_ForwardToServer);
-       Cmd_AddCommand ("wait", Cmd_Wait_f);
-       Cmd_AddCommand ("cmdlist", Cmd_List_f);         // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
-       Cmd_AddCommand ("cvarlist", Cvar_List_f);       // 2000-01-09 CmdList, CvarList commands
-                                                                                               // By Matthias "Maddes" Buecher
-       Cmd_AddCommand ("set", Cvar_Set_f);
-       Cmd_AddCommand ("seta", Cvar_SetA_f);
+       Cmd_AddCommand ("stuffcmds",Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)");
+       Cmd_AddCommand ("exec",Cmd_Exec_f, "execute a script file");
+       Cmd_AddCommand ("echo",Cmd_Echo_f, "print a message to the console (useful in scripts)");
+       Cmd_AddCommand ("alias",Cmd_Alias_f, "create a script function (parameters are passed in as $1 through $9, and $* for all parameters)");
+       Cmd_AddCommand ("cmd", Cmd_ForwardToServer, "send a console commandline to the server (used by some mods)");
+       Cmd_AddCommand ("wait", Cmd_Wait_f, "make script execution wait for next rendered frame");
+       Cmd_AddCommand ("set", Cvar_Set_f, "create or change the value of a console variable");
+       Cmd_AddCommand ("seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
+
+       // 2000-01-09 CmdList, CvarList commands By Matthias "Maddes" Buecher
+       // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
+       Cmd_AddCommand ("cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix");
+       Cmd_AddCommand ("cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix");
 }
 
 /*
@@ -680,7 +690,7 @@ static void Cmd_TokenizeString (const char *text)
 Cmd_AddCommand
 ============
 */
-void Cmd_AddCommand (const char *cmd_name, xcommand_t function)
+void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *description)
 {
        cmd_function_t *cmd;
        cmd_function_t *prev, *current;
@@ -713,6 +723,7 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function)
        cmd = (cmd_function_t *)Mem_Alloc(cmd_mempool, sizeof(cmd_function_t));
        cmd->name = cmd_name;
        cmd->function = function;
+       cmd->description = description;
        if(!function)                   //[515]: csqc
                cmd->csqcfunc = true;
        cmd->next = cmd_functions;
@@ -762,7 +773,7 @@ const char *Cmd_CompleteCommand (const char *partial)
 
 // check functions
        for (cmd = cmd_functions; cmd; cmd = cmd->next)
-               if (!strncmp(partial, cmd->name, len))
+               if (!strncasecmp(partial, cmd->name, len))
                        return cmd->name;
 
        return NULL;
@@ -825,6 +836,17 @@ const char **Cmd_CompleteBuildList (const char *partial)
        return buf;
 }
 
+// written by LordHavoc
+void Cmd_CompleteCommandPrint (const char *partial)
+{
+       cmd_function_t *cmd;
+       size_t len = strlen(partial);
+       // Loop through the command list and print all matches
+       for (cmd = cmd_functions; cmd; cmd = cmd->next)
+               if (!strncasecmp(partial, cmd->name, len))
+                       Con_Printf("%s : %s\n", cmd->name, cmd->description);
+}
+
 /*
        Cmd_CompleteAlias
 
@@ -852,6 +874,18 @@ const char *Cmd_CompleteAlias (const char *partial)
        return NULL;
 }
 
+// written by LordHavoc
+void Cmd_CompleteAliasPrint (const char *partial)
+{
+       cmdalias_t *alias;
+       size_t len = strlen(partial);
+       // Loop through the alias list and print all matches
+       for (alias = cmd_alias; alias; alias = alias->next)
+               if (!strncasecmp(partial, alias->name, len))
+                       Con_Printf("%s : %s\n", alias->name, alias->value);
+}
+
+
 /*
        Cmd_CompleteAliasCountPossible
 
@@ -996,14 +1030,17 @@ void Cmd_ForwardStringToServer (const char *s)
                return;
        }
 
-       if (cls.demoplayback)
-               return;         // not really connected
+       if (!cls.netcon)
+               return;
 
        // LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
        // attention, it has been eradicated from here, its only (former) use in
        // all of darkplaces.
-       MSG_WriteByte(&cls.message, clc_stringcmd);
-       SZ_Write(&cls.message, (const unsigned char *)s, (int)strlen(s) + 1);
+       if (cls.protocol == PROTOCOL_QUAKEWORLD)
+               MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
+       else
+               MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+       SZ_Write(&cls.netcon->message, (const unsigned char *)s, (int)strlen(s) + 1);
 }
 
 /*