}
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);
}
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);
}
/*
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++;
{
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 );
}
/*
// 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++;
// 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.netcon->message, clc_stringcmd);
+ 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