X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=d68a289a90822fad3396b7c471fa483ee89a30f2;hb=72943b86b04da4f0ee7b4074287ec3743b8cd077;hp=476ec67b549136595865a3954e116f269c1beb53;hpb=14038bdf05fbf63362de75588bc248c1690553fd;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.c b/cmd.c
index 476ec67b..d68a289a 100644
--- a/cmd.c
+++ b/cmd.c
@@ -21,17 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#define	MAX_ALIAS_NAME	32
-// this is the largest script file that can be executed in one step
-// LordHavoc: inreased this from 8192 to 32768
-// div0: increased this from 32k to 128k
-// div0: increased this from 128k to 640k which ought to be enough for anyone
-#define CMDBUFSIZE 655360
-// maximum number of parameters to a command
-#define	MAX_ARGS 80
-// maximum tokenizable commandline length (counting NUL terminations)
-#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + MAX_ARGS)
-
 typedef struct cmdalias_s
 {
 	struct cmdalias_s *next;
@@ -754,6 +743,10 @@ static const char *Cmd_GetDirectCvarValue(const char *varname, cmdalias_t *alias
 				*is_multiple = true;
 			return Cmd_Args();
 		}
+		else if(!strcmp(varname, "#"))
+		{
+			return va("%d", Cmd_Argc());
+		}
 		else if(varname[strlen(varname) - 1] == '-')
 		{
 			argno = strtol(varname, &endptr, 10);
@@ -1003,7 +996,7 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma
 					eat = varlen + 1;
 				}
 			} else {
-				varlen = strspn(in, "*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
+				varlen = strspn(in, "#*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
 				val = Cmd_GetCvarValue(in, varlen, alias);
 				eat = varlen;
 			}
@@ -1193,8 +1186,8 @@ void Cmd_Init_Commands (void)
 
 	// 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");
+	Cmd_AddCommand ("cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix or matching the specified wildcard pattern");
+	Cmd_AddCommand ("cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix or matching the specified wildcard pattern");
 	Cmd_AddCommand ("apropos", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description");
 
 	Cmd_AddCommand ("cvar_lockdefaults", Cvar_LockDefaults_f, "stores the current values of all cvars into their default values, only used once during startup after parsing default.cfg");
@@ -1640,7 +1633,6 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src)
 					Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(0));
 				found = true;
 				goto command_found;
-				break;
 			case src_client:
 				if (cmd->clientfunction)
 				{