}
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");
+
Cbuf_InsertText (f);
Mem_Free(f);
}
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 <variable> - toggles between 0 and 1\n toggle <variable> <value> - toggles between 0 and <value>\n toggle <variable> [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
char cmd[MAX_INPUTLINE];
int i, c;
const char *s;
+ size_t alloclen;
if (Cmd_Argc() == 1)
{
}
strlcat (cmd, "\n", sizeof (cmd));
- a->value = (char *)Z_Malloc (strlen (cmd) + 1);
- strcpy (a->value, cmd);
+ alloclen = strlen (cmd) + 1;
+ a->value = (char *)Z_Malloc (alloclen);
+ memcpy (a->value, cmd, alloclen);
}
/*
{
struct cmd_function_s *next;
const char *name;
+ const char *description;
xcommand_t function;
+ qboolean csqcfunc;
} cmd_function_t;
static int cmd_argc;
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++;
const char *tempin = in;
COM_ParseTokenConsole( &tempin );
- if ((cvar = Cvar_FindVar(&com_token[0]))) {
+ // 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 {
- 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++] = '$';
}
}
{
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 );
}
/*
{
if (partial && strncmp(partial, cmd->name, len))
continue;
- Con_Printf("%s\n", cmd->name);
+ Con_Printf("%s : %s\n", cmd->name, cmd->description);
count++;
}
//
// 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)");
}
/*
Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH);
break;
}
- strcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token);
+ memcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token, l);
cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos;
cmd_tokenizebufferpos += l;
cmd_argc++;
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;
{
if (!strcmp (cmd_name, cmd->name))
{
- Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
- return;
+ if (function)
+ {
+ Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
+ return;
+ }
+ else //[515]: csqc
+ {
+ cmd->csqcfunc = true;
+ return;
+ }
}
}
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;
// insert it at the right alphanumeric position
// 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;
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
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
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
{
if (!strcasecmp (cmd_argv[0],cmd->name))
{
- cmd->function ();
+ if(cmd->function && !cmd->csqcfunc)
+ cmd->function ();
+ else
+ if(CL_VM_ConsoleCommand (text)) //[515]: csqc
+ return;
+ else
+ if(cmd->function)
+ cmd->function ();
cmd_tokenizebufferpos = oldpos;
return;
}
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);
}
/*
projects / xonotic / darkplaces.git / blobdiff