yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 20:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd.c aufgeräumt

Browse source
This commit is contained in:
Yamagi Burmeister 2009-03-03 17:51:37 +00:00
parent b66c5ba461
commit 78f5147161
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/common/cmd.c
View file

@ -116,7 +116,7 @@ void Cbuf_InsertText (char *text)
char *temp; char *temp;
int templen; int templen;
// copy off any commands still remaining in the exec buffer // copy off any commands still remaining in the exec buffer
templen = cmd_text.cursize; templen = cmd_text.cursize;
if (templen) if (templen)
{ {
@ -127,10 +127,10 @@ void Cbuf_InsertText (char *text)
else else
temp = NULL; // shut up compiler temp = NULL; // shut up compiler
// add the entire text of the file // add the entire text of the file
Cbuf_AddText (text); Cbuf_AddText (text);
// add the copied off data // add the copied off data
if (templen) if (templen)
{ {
SZ_Write (&cmd_text, temp, templen); SZ_Write (&cmd_text, temp, templen);
@ -202,7 +202,7 @@ void Cbuf_Execute (void)
while (cmd_text.cursize) while (cmd_text.cursize)
{ {
// find a \n or ; line break // find a \n or ; line break
text = (char *)cmd_text.data; text = (char *)cmd_text.data;
quotes = 0; quotes = 0;
@ -220,9 +220,9 @@ void Cbuf_Execute (void)
memcpy (line, text, i); memcpy (line, text, i);
line[i] = 0; line[i] = 0;
// delete the text from the command buffer and move remaining commands down // delete the text from the command buffer and move remaining commands down
// this is necessary because commands (exec, alias) can insert data at the // this is necessary because commands (exec, alias) can insert data at the
// beginning of the text buffer // beginning of the text buffer
if (i == cmd_text.cursize) if (i == cmd_text.cursize)
cmd_text.cursize = 0; cmd_text.cursize = 0;
@ -233,7 +233,7 @@ void Cbuf_Execute (void)
memmove (text, text+i, cmd_text.cursize); memmove (text, text+i, cmd_text.cursize);
} }
// execute the command line // execute the command line
Cmd_ExecuteString (line); Cmd_ExecuteString (line);
if (cmd_wait) if (cmd_wait)
@ -301,7 +301,7 @@ qboolean Cbuf_AddLateCommands (void)
int argc; int argc;
qboolean ret; qboolean ret;
// build the combined string to parse from // build the combined string to parse from
s = 0; s = 0;
argc = COM_Argc(); argc = COM_Argc();
for (i=1 ; i<argc ; i++) for (i=1 ; i<argc ; i++)
@ -320,7 +320,7 @@ qboolean Cbuf_AddLateCommands (void)
strcat (text, " "); strcat (text, " ");
} }
// pull out the commands // pull out the commands
build = Z_Malloc (s+1); build = Z_Malloc (s+1);
build[0] = 0; build[0] = 0;
@ -462,7 +462,7 @@ void Cmd_Alias_f (void)
} }
strcpy (a->name, s); strcpy (a->name, s);
// copy the rest of the command line // copy the rest of the command line
cmd[0] = 0; // start out with a null string cmd[0] = 0; // start out with a null string
c = Cmd_Argc(); c = Cmd_Argc();
for (i=2 ; i< c ; i++) for (i=2 ; i< c ; i++)
@ -620,9 +620,9 @@ $Cvars will be expanded unless they are in a quoted token
void Cmd_TokenizeString (char *text, qboolean macroExpand) void Cmd_TokenizeString (char *text, qboolean macroExpand)
{ {
int i; int i;
char *com_token; const char *com_token;
// clear the args from the last string // clear the args from the last string
for (i=0 ; i<cmd_argc ; i++) for (i=0 ; i<cmd_argc ; i++)
Z_Free (cmd_argv[i]); Z_Free (cmd_argv[i]);
@ -637,7 +637,7 @@ void Cmd_TokenizeString (char *text, qboolean macroExpand)
while (1) while (1)
{ {
// skip whitespace up to a /n // skip whitespace up to a /n
while (*text && *text <= ' ' && *text != '\n') while (*text && *text <= ' ' && *text != '\n')
{ {
text++; text++;
@ -692,14 +692,13 @@ void Cmd_AddCommand (char *cmd_name, xcommand_t function)
{ {
cmd_function_t *cmd; cmd_function_t *cmd;
// fail if the command is a variable name // fail if the command is a variable name
if (Cvar_VariableString(cmd_name)[0]) if (Cvar_VariableString(cmd_name)[0])
{ {
Com_Printf ("Cmd_AddCommand: %s already defined as a var\n", cmd_name); Cmd_RemoveCommand (cmd_name);
return;
} }
// fail if the command already exists // fail if the command already exists
for (cmd=cmd_functions ; cmd ; cmd=cmd->next) for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
{ {
if (!strcmp (cmd_name, cmd->name)) if (!strcmp (cmd_name, cmd->name))
@ -780,7 +779,7 @@ char *Cmd_CompleteCommand (char *partial)
if (!len) if (!len)
return NULL; return NULL;
// check for exact match // check for exact match
for (cmd=cmd_functions ; cmd ; cmd=cmd->next) for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
if (!strcmp (partial,cmd->name)) if (!strcmp (partial,cmd->name))
return cmd->name; return cmd->name;
@ -788,7 +787,7 @@ char *Cmd_CompleteCommand (char *partial)
if (!strcmp (partial, a->name)) if (!strcmp (partial, a->name))
return a->name; return a->name;
// check for partial match // check for partial match
for (cmd=cmd_functions ; cmd ; cmd=cmd->next) for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
if (!strncmp (partial,cmd->name, len)) if (!strncmp (partial,cmd->name, len))
return cmd->name; return cmd->name;
@ -880,9 +879,9 @@ Cmd_Init
*/ */
void Cmd_Init (void) void Cmd_Init (void)
{ {
// //
// register our commands // register our commands
// //
Cmd_AddCommand ("cmdlist",Cmd_List_f); Cmd_AddCommand ("cmdlist",Cmd_List_f);
Cmd_AddCommand ("exec",Cmd_Exec_f); Cmd_AddCommand ("exec",Cmd_Exec_f);
Cmd_AddCommand ("echo",Cmd_Echo_f); Cmd_AddCommand ("echo",Cmd_Echo_f);