X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=00aa78ba00bda6298494e3cfc82bf98c3da610de;hb=f0757fc81effdb25efebd8b74750045ae227b4aa;hp=40d1b72d40afd524ed665e1c02a6033faaebe07e;hpb=07bb8dfd848ac2d25466809c4e24d81769380c47;p=xonotic%2Fdarkplaces.git diff --git a/cmd.c b/cmd.c index 40d1b72d..00aa78ba 100644 --- a/cmd.c +++ b/cmd.c @@ -22,6 +22,13 @@ 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 +#define CMDBUFSIZE 32768 +// maximum number of parameters to a command +#define MAX_ARGS 80 +// maximum tokenizable commandline length (counting NUL terminations) +#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + 80) typedef struct cmdalias_s { @@ -36,7 +43,6 @@ static qboolean cmd_wait; static mempool_t *cmd_mempool; -#define CMD_TOKENIZELENGTH 4096 static char cmd_tokenizebuffer[CMD_TOKENIZELENGTH]; static int cmd_tokenizebufferpos = 0; @@ -64,9 +70,8 @@ static void Cmd_Wait_f (void) ============================================================================= */ - // LordHavoc: inreased this from 8192 to 32768 static sizebuf_t cmd_text; -static qbyte cmd_text_buf[32768]; +static unsigned char cmd_text_buf[CMDBUFSIZE]; /* ============ @@ -79,7 +84,7 @@ void Cbuf_AddText (const char *text) { int l; - l = strlen (text); + l = (int)strlen (text); if (cmd_text.cursize + l >= cmd_text.maxsize) { @@ -87,7 +92,7 @@ void Cbuf_AddText (const char *text) return; } - SZ_Write (&cmd_text, text, strlen (text)); + SZ_Write (&cmd_text, (const unsigned char *)text, (int)strlen (text)); } @@ -109,7 +114,7 @@ void Cbuf_InsertText (const char *text) templen = cmd_text.cursize; if (templen) { - temp = Mem_Alloc (tempmempool, templen); + temp = (char *)Mem_Alloc (tempmempool, templen); memcpy (temp, cmd_text.data, templen); SZ_Clear (&cmd_text); } @@ -122,7 +127,7 @@ void Cbuf_InsertText (const char *text) // add the copied off data if (temp != NULL) { - SZ_Write (&cmd_text, temp, templen); + SZ_Write (&cmd_text, (const unsigned char *)temp, templen); Mem_Free (temp); } } @@ -132,11 +137,13 @@ void Cbuf_InsertText (const char *text) Cbuf_Execute ============ */ +static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias ); void Cbuf_Execute (void) { int i; char *text; - char line[1024]; + char line[MAX_INPUTLINE]; + char preprocessed[MAX_INPUTLINE]; int quotes; // LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes @@ -151,8 +158,10 @@ void Cbuf_Execute (void) for (i=0 ; i< cmd_text.cursize ; i++) { if (text[i] == '"') - quotes++; - if ( !(quotes&1) && text[i] == ';') + quotes ^= 1; + if (text[i] == '\\' && text[i+1] == '"') + i++; + if ( !quotes && text[i] == ';') break; // don't break if inside a quoted string if (text[i] == '\r' || text[i] == '\n') break; @@ -175,7 +184,8 @@ void Cbuf_Execute (void) } // execute the command line - Cmd_ExecuteString (line, src_command); + Cmd_PreprocessString( line, preprocessed, sizeof(preprocessed), NULL ); + Cmd_ExecuteString (preprocessed, src_command); if (cmd_wait) { // skip out while text still remains in buffer, leaving it @@ -208,8 +218,8 @@ qboolean host_stuffcmdsrun = false; void Cmd_StuffCmds_f (void) { int i, j, l; - // this is per command, and bounds checked (no buffer overflows) - char build[2048]; + // this is for all commandline options combined (and is bounds checked) + char build[MAX_INPUTLINE]; if (Cmd_Argc () != 1) { @@ -217,12 +227,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++]; @@ -233,20 +248,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); } @@ -265,7 +284,7 @@ static void Cmd_Exec_f (void) return; } - f = (char *)FS_LoadFile (Cmd_Argv(1), tempmempool, false); + f = (char *)FS_LoadFile (Cmd_Argv(1), tempmempool, false, NULL); if (!f) { Con_Printf("couldn't exec %s\n",Cmd_Argv(1)); @@ -273,6 +292,15 @@ static void Cmd_Exec_f (void) } Con_DPrintf("execing %s\n",Cmd_Argv(1)); + // if executing default.cfg for the first time, lock the cvar defaults + // it may seem backwards to insert this text BEFORE the default.cfg + // but Cbuf_InsertText inserts before, so this actually ends up after it. + if (!strcmp(Cmd_Argv(1), "default.cfg")) + Cbuf_InsertText("\ncvar_lockdefaults\n"); + + // insert newline after the text to make sure the last line is terminated (some text editors omit the trailing newline) + // (note: insertion order here is backwards from execution order, so this adds it after the text, by calling it before...) + Cbuf_InsertText ("\n"); Cbuf_InsertText (f); Mem_Free(f); } @@ -294,6 +322,86 @@ static void Cmd_Echo_f (void) Con_Print("\n"); } +// DRESK - 5/14/06 +// Support Doom3-style Toggle Console Command +/* +=============== +Cmd_Toggle_f + +Toggles a specified console variable amongst the values specified (default is 0 and 1) +=============== +*/ +static void Cmd_Toggle_f(void) +{ + // Acquire Number of Arguments + int nNumArgs = Cmd_Argc(); + + if(nNumArgs == 1) + // No Arguments Specified; Print Usage + Con_Print("Toggle Console Variable - Usage\n toggle - toggles between 0 and 1\n toggle - toggles between 0 and \n toggle [string 1] [string 2]...[string n] - cycles through all strings\n"); + else + { // Correct Arguments Specified + // Acquire Potential CVar + cvar_t* cvCVar = Cvar_FindVar( Cmd_Argv(1) ); + + if(cvCVar != NULL) + { // Valid CVar + if(nNumArgs == 2) + { // Default Usage + if(cvCVar->integer) + Cvar_SetValueQuick(cvCVar, 0); + else + Cvar_SetValueQuick(cvCVar, 1); + } + else + if(nNumArgs == 3) + { // 0 and Specified Usage + if(cvCVar->integer == atoi(Cmd_Argv(2) ) ) + // CVar is Specified Value; // Reset to 0 + Cvar_SetValueQuick(cvCVar, 0); + else + if(cvCVar->integer == 0) + // CVar is 0; Specify Value + Cvar_SetQuick(cvCVar, Cmd_Argv(2) ); + else + // CVar does not match; Reset to 0 + Cvar_SetValueQuick(cvCVar, 0); + } + else + { // Variable Values Specified + int nCnt; + int bFound = 0; + + for(nCnt = 2; nCnt < nNumArgs; nCnt++) + { // Cycle through Values + if( strcmp(cvCVar->string, Cmd_Argv(nCnt) ) == 0) + { // Current Value Located; Increment to Next + if( (nCnt + 1) == nNumArgs) + // Max Value Reached; Reset + Cvar_SetQuick(cvCVar, Cmd_Argv(2) ); + else + // Next Value + Cvar_SetQuick(cvCVar, Cmd_Argv(nCnt + 1) ); + + // End Loop + nCnt = nNumArgs; + // Assign Found + bFound = 1; + } + } + if(!bFound) + // Value not Found; Reset to Original + Cvar_SetQuick(cvCVar, Cmd_Argv(2) ); + } + + } + else + { // Invalid CVar + Con_Printf("ERROR : CVar '%s' not found\n", Cmd_Argv(2) ); + } + } +} + /* =============== Cmd_Alias_f @@ -304,9 +412,10 @@ Creates a new command that executes a command string (possibly ; seperated) static void Cmd_Alias_f (void) { cmdalias_t *a; - char cmd[1024]; + char cmd[MAX_INPUTLINE]; int i, c; const char *s; + size_t alloclen; if (Cmd_Argc() == 1) { @@ -337,7 +446,7 @@ static void Cmd_Alias_f (void) { cmdalias_t *prev, *current; - a = Z_Malloc (sizeof(cmdalias_t)); + a = (cmdalias_t *)Z_Malloc (sizeof(cmdalias_t)); strlcpy (a->name, s, sizeof (a->name)); // insert it at the right alphanumeric position for( prev = NULL, current = cmd_alias ; current && strcmp( current->name, a->name ) < 0 ; prev = current, current = current->next ) @@ -362,8 +471,9 @@ static void Cmd_Alias_f (void) } strlcat (cmd, "\n", sizeof (cmd)); - a->value = Z_Malloc (strlen (cmd) + 1); - strcpy (a->value, cmd); + alloclen = strlen (cmd) + 1; + a->value = (char *)Z_Malloc (alloclen); + memcpy (a->value, cmd, alloclen); } /* @@ -378,22 +488,129 @@ typedef struct cmd_function_s { struct cmd_function_s *next; const char *name; - xcommand_t function; + const char *description; + xcommand_t consolefunction; + xcommand_t clientfunction; + qboolean csqcfunc; } cmd_function_t; - -#define MAX_ARGS 80 - static int cmd_argc; static const char *cmd_argv[MAX_ARGS]; static const char *cmd_null_string = ""; -static const char *cmd_args = NULL; - +static const char *cmd_args; cmd_source_t cmd_source; static cmd_function_t *cmd_functions; // possible commands to execute +/* +Cmd_PreprocessString + +Preprocesses strings and replaces $*, $param#, $cvar accordingly +*/ +static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias ) { + const char *in; + unsigned outlen; + int inquote; + + // don't crash if there's no room in the outtext buffer + if( maxoutlen == 0 ) { + return; + } + maxoutlen--; // because of \0 + + in = intext; + outlen = 0; + inquote = 0; + + while( *in && outlen < maxoutlen ) { + if( *in == '$' && !inquote ) { + // this is some kind of expansion, see what comes after the $ + in++; + // replacements that can always be used: + // $$ is replaced with $, to allow escaping $ + // $ is replaced with the contents of the cvar + // + // the following can be used in aliases only: + // $* is replaced with all formal parameters (including name of the alias - this probably is not desirable) + // $0 is replaced with the name of this alias + // $ is replaced with an argument to this alias (or copied as-is if no such parameter exists), can be multiple digits + if( *in == '$' ) { + outtext[outlen++] = *in++; + } else if( *in == '*' && alias ) { + const char *linein = Cmd_Args(); + + // include all parameters + if (linein) { + while( *linein && outlen < maxoutlen ) { + outtext[outlen++] = *linein++; + } + } + + in++; + } else if( '0' <= *in && *in <= '9' && alias ) { + char *nexttoken; + int argnum; + + argnum = strtol( in, &nexttoken, 10 ); + + if( 0 <= argnum && argnum < Cmd_Argc() ) { + const char *param = Cmd_Argv( argnum ); + while( *param && outlen < maxoutlen ) { + outtext[outlen++] = *param++; + } + in = nexttoken; + } else if( argnum >= Cmd_Argc() ) { + Con_Printf( "Warning: Not enough parameters passed to alias '%s', at least %i expected:\n %s\n", alias->name, argnum, alias->value ); + outtext[outlen++] = '$'; + } + } else { + cvar_t *cvar; + const char *tempin = in; + + COM_ParseToken_Console( &tempin ); + // don't expand rcon_password or similar cvars (CVAR_PRIVATE flag) + if ((cvar = Cvar_FindVar(&com_token[0])) && !(cvar->flags & CVAR_PRIVATE)) { + const char *cvarcontent = cvar->string; + while( *cvarcontent && outlen < maxoutlen ) { + outtext[outlen++] = *cvarcontent++; + } + in = tempin; + } else { + 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++] = '$'; + } + } + } else { + if( *in == '"' ) { + inquote ^= 1; + } + outtext[outlen++] = *in++; + } + } + outtext[outlen] = 0; +} + +/* +============ +Cmd_ExecuteAlias + +Called for aliases and fills in the alias into the cbuffer +============ +*/ +static void Cmd_ExecuteAlias (cmdalias_t *alias) +{ + static char buffer[ MAX_INPUTLINE + 2 ]; + Cmd_PreprocessString( alias->value, buffer, sizeof(buffer) - 2, alias ); + // insert at start of command buffer, so that aliases execute in order + // (fixes bug introduced by Black on 20050705) + Cbuf_InsertText( buffer ); +} + /* ======== Cmd_List @@ -412,7 +629,7 @@ static void Cmd_List_f (void) if (Cmd_Argc() > 1) { partial = Cmd_Argv (1); - len = strlen(partial); + len = (int)strlen(partial); } else { @@ -425,15 +642,14 @@ 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++; } - Con_Printf("%i Command%s", count, (count > 1) ? "s" : ""); if (partial) - Con_Printf(" beginning with \"%s\"", partial); - - Con_Print("\n\n"); + Con_Printf("%i Command%s beginning with \"%s\"\n\n", count, (count > 1) ? "s" : "", partial); + else + Con_Printf("%i Command%s\n\n", count, (count > 1) ? "s" : ""); } /* @@ -455,17 +671,28 @@ 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"); + + 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"); + Cmd_AddCommand ("cvar_resettodefaults_all", Cvar_ResetToDefaults_All_f, "sets all cvars to their locked default values"); + Cmd_AddCommand ("cvar_resettodefaults_nosaveonly", Cvar_ResetToDefaults_NoSaveOnly_f, "sets all non-saved cvars to their locked default values (variables that will not be saved to config.cfg)"); + Cmd_AddCommand ("cvar_resettodefaults_saveonly", Cvar_ResetToDefaults_SaveOnly_f, "sets all saved cvars to their locked default values (variables that will be saved to config.cfg)"); + + // DRESK - 5/14/06 + // Support Doom3-style Toggle Command + Cmd_AddCommand( "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)"); } /* @@ -518,6 +745,7 @@ Cmd_TokenizeString Parses the given string into command line tokens. ============ */ +// AK: This function should only be called from ExcuteString because the current design is a bit of an hack static void Cmd_TokenizeString (const char *text) { int l; @@ -537,7 +765,7 @@ static void Cmd_TokenizeString (const char *text) // Windows: \r\n if (*text == '\n' || *text == '\r') { - // a newline seperates commands in the buffer + // a newline separates commands in the buffer if (*text == '\r' && text[1] == '\n') text++; text++; @@ -548,23 +776,25 @@ static void Cmd_TokenizeString (const char *text) return; if (cmd_argc == 1) - cmd_args = text; + cmd_args = text; - if (!COM_ParseTokenConsole(&text)) + if (!COM_ParseToken_Console(&text)) return; if (cmd_argc < MAX_ARGS) { - l = strlen(com_token) + 1; + l = (int)strlen(com_token) + 1; if (cmd_tokenizebufferpos + l > CMD_TOKENIZELENGTH) - Sys_Error("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH); - strcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token); + { + Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH); + break; + } + memcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token, l); cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos; cmd_tokenizebufferpos += l; cmd_argc++; } } - } @@ -573,13 +803,13 @@ static void Cmd_TokenizeString (const char *text) Cmd_AddCommand ============ */ -void Cmd_AddCommand (const char *cmd_name, xcommand_t function) +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; // fail if the command is a variable name - if (Cvar_VariableString(cmd_name)[0]) + if (Cvar_FindVar( cmd_name )) { Con_Printf("Cmd_AddCommand: %s already defined as a var\n", cmd_name); return; @@ -590,14 +820,26 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function) { if (!strcmp (cmd_name, cmd->name)) { - Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name); - return; + if (consolefunction || clientfunction) + { + Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name); + return; + } + else //[515]: csqc + { + cmd->csqcfunc = true; + return; + } } } - cmd = Mem_Alloc(cmd_mempool, sizeof(cmd_function_t)); + 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(!consolefunction && !clientfunction) //[515]: csqc + cmd->csqcfunc = true; cmd->next = cmd_functions; // insert it at the right alphanumeric position @@ -611,6 +853,11 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function) 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 @@ -636,7 +883,7 @@ Cmd_CompleteCommand const char *Cmd_CompleteCommand (const char *partial) { cmd_function_t *cmd; - int len; + size_t len; len = strlen(partial); @@ -645,7 +892,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; @@ -663,7 +910,8 @@ const char *Cmd_CompleteCommand (const char *partial) int Cmd_CompleteCountPossible (const char *partial) { cmd_function_t *cmd; - int len, h; + size_t len; + int h; h = 0; len = strlen(partial); @@ -691,13 +939,13 @@ int Cmd_CompleteCountPossible (const char *partial) const char **Cmd_CompleteBuildList (const char *partial) { cmd_function_t *cmd; - int len = 0; - int bpos = 0; - int sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (const char *); + size_t len = 0; + size_t bpos = 0; + size_t sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (const char *); const char **buf; len = strlen(partial); - buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); + buf = (const char **)Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); // Loop through the alias list and print all matches for (cmd = cmd_functions; cmd; cmd = cmd->next) if (!strncasecmp(partial, cmd->name, len)) @@ -707,6 +955,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 @@ -719,7 +978,7 @@ const char **Cmd_CompleteBuildList (const char *partial) const char *Cmd_CompleteAlias (const char *partial) { cmdalias_t *alias; - int len; + size_t len; len = strlen(partial); @@ -734,6 +993,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 @@ -746,7 +1017,7 @@ const char *Cmd_CompleteAlias (const char *partial) int Cmd_CompleteAliasCountPossible (const char *partial) { cmdalias_t *alias; - int len; + size_t len; int h; h = 0; @@ -776,13 +1047,13 @@ int Cmd_CompleteAliasCountPossible (const char *partial) const char **Cmd_CompleteAliasBuildList (const char *partial) { cmdalias_t *alias; - int len = 0; - int bpos = 0; - int sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (const char *); + size_t len = 0; + size_t bpos = 0; + size_t sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (const char *); const char **buf; len = strlen(partial); - buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); + buf = (const char **)Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); // Loop through the alias list and print all matches for (alias = cmd_alias; alias; alias = alias->next) if (!strncasecmp(partial, alias->name, len)) @@ -792,6 +1063,14 @@ const char **Cmd_CompleteAliasBuildList (const char *partial) return buf; } +void Cmd_ClearCsqcFuncs (void) +{ + cmd_function_t *cmd; + for (cmd=cmd_functions ; cmd ; cmd=cmd->next) + cmd->csqcfunc = false; +} + +qboolean CL_VM_ConsoleCommand (const char *cmd); /* ============ Cmd_ExecuteString @@ -808,6 +1087,7 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) oldpos = cmd_tokenizebufferpos; cmd_source = src; + Cmd_TokenizeString (text); // execute the command line @@ -822,18 +1102,53 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) { if (!strcasecmp (cmd_argv[0],cmd->name)) { - cmd->function (); - cmd_tokenizebufferpos = oldpos; - 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 + 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) { if (!strcasecmp (cmd_argv[0], a->name)) { - Cbuf_InsertText (a->value); + Cmd_ExecuteAlias(a); cmd_tokenizebufferpos = oldpos; return; } @@ -856,20 +1171,122 @@ Sends an entire command string over to the server, unprocessed */ void Cmd_ForwardStringToServer (const char *s) { + char temp[128]; if (cls.state != ca_connected) { Con_Printf("Can't \"%s\", not connected\n", 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, s, strlen(s) + 1); + if (cls.protocol == PROTOCOL_QUAKEWORLD) + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + else + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + if ((!strncmp(s, "say ", 4) || !strncmp(s, "say_team ", 9)) && cl_locs_enable.integer) + { + // say/say_team commands can replace % character codes with status info + while (*s) + { + if (*s == '%' && s[1]) + { + // handle proquake message macros + temp[0] = 0; + switch (s[1]) + { + case 'l': // current location + CL_Locs_FindLocationName(temp, sizeof(temp), cl.movement_origin); + break; + case 'h': // current health + dpsnprintf(temp, sizeof(temp), "%i", cl.stats[STAT_HEALTH]); + break; + case 'a': // current armor + dpsnprintf(temp, sizeof(temp), "%i", cl.stats[STAT_ARMOR]); + break; + case 'x': // current rockets + dpsnprintf(temp, sizeof(temp), "%i", cl.stats[STAT_ROCKETS]); + break; + case 'c': // current cells + dpsnprintf(temp, sizeof(temp), "%i", cl.stats[STAT_CELLS]); + break; + // silly proquake macros + case 'd': // loc at last death + CL_Locs_FindLocationName(temp, sizeof(temp), cl.lastdeathorigin); + break; + case 't': // current time + dpsnprintf(temp, sizeof(temp), "%.0f:%.0f", floor(cl.time / 60), cl.time - floor(cl.time / 60) * 60); + break; + case 'r': // rocket launcher status ("I have RL", "I need rockets", "I need RL") + if (!(cl.stats[STAT_ITEMS] & IT_ROCKET_LAUNCHER)) + dpsnprintf(temp, sizeof(temp), "I need RL"); + else if (!cl.stats[STAT_ROCKETS]) + dpsnprintf(temp, sizeof(temp), "I need rockets"); + else + dpsnprintf(temp, sizeof(temp), "I have RL"); + break; + case 'p': // powerup status (outputs "quad" "pent" and "eyes" according to status) + if (cl.stats[STAT_ITEMS] & IT_QUAD) + { + if (temp[0]) + strlcat(temp, " ", sizeof(temp)); + strlcat(temp, "quad", sizeof(temp)); + } + if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) + { + if (temp[0]) + strlcat(temp, " ", sizeof(temp)); + strlcat(temp, "pent", sizeof(temp)); + } + if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) + { + if (temp[0]) + strlcat(temp, " ", sizeof(temp)); + strlcat(temp, "eyes", sizeof(temp)); + } + break; + case 'w': // weapon status (outputs "SSG:NG:SNG:GL:RL:LG" with the text between : characters omitted if you lack the weapon) + if (cl.stats[STAT_ITEMS] & IT_SUPER_SHOTGUN) + strlcat(temp, "SSG", sizeof(temp)); + strlcat(temp, ":", sizeof(temp)); + if (cl.stats[STAT_ITEMS] & IT_NAILGUN) + strlcat(temp, "NG", sizeof(temp)); + strlcat(temp, ":", sizeof(temp)); + if (cl.stats[STAT_ITEMS] & IT_SUPER_NAILGUN) + strlcat(temp, "SNG", sizeof(temp)); + strlcat(temp, ":", sizeof(temp)); + if (cl.stats[STAT_ITEMS] & IT_GRENADE_LAUNCHER) + strlcat(temp, "GL", sizeof(temp)); + strlcat(temp, ":", sizeof(temp)); + if (cl.stats[STAT_ITEMS] & IT_ROCKET_LAUNCHER) + strlcat(temp, "RL", sizeof(temp)); + strlcat(temp, ":", sizeof(temp)); + if (cl.stats[STAT_ITEMS] & IT_LIGHTNING) + strlcat(temp, "LG", sizeof(temp)); + break; + default: + // not a recognized macro, print it as-is... + temp[0] = s[0]; + temp[1] = s[1]; + temp[2] = 0; + break; + } + // write the resulting text + SZ_Write(&cls.netcon->message, (unsigned char *)temp, strlen(temp)); + s += 2; + continue; + } + MSG_WriteByte(&cls.netcon->message, *s); + s++; + } + MSG_WriteByte(&cls.netcon->message, 0); + } + else // any other command is passed on as-is + SZ_Write(&cls.netcon->message, (const unsigned char *)s, (int)strlen(s) + 1); } /* @@ -882,10 +1299,19 @@ Sends the entire command line over to the server void Cmd_ForwardToServer (void) { const char *s; - if (strcasecmp(Cmd_Argv(0), "cmd")) - s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : ""); - else + if (!strcasecmp(Cmd_Argv(0), "cmd")) + { + // we want to strip off "cmd", so just send the args s = Cmd_Argc() > 1 ? Cmd_Args() : ""; + } + else + { + // we need to keep the command name, so send Cmd_Argv(0), a space and then Cmd_Args() + s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : ""); + } + // don't send an empty forward message if the user tries "cmd" by itself + if (!s || !*s) + return; Cmd_ForwardStringToServer(s); } @@ -904,7 +1330,10 @@ int Cmd_CheckParm (const char *parm) int i; if (!parm) - Sys_Error ("Cmd_CheckParm: NULL"); + { + Con_Printf ("Cmd_CheckParm: NULL"); + return 0; + } for (i = 1; i < Cmd_Argc (); i++) if (!strcasecmp (parm, Cmd_Argv (i)))