IOQ3 commit 2258

This commit is contained in:
Richard Allen 2012-10-04 14:33:36 +00:00
parent 4d091770eb
commit 3a62732c38

View file

@ -265,14 +265,18 @@ Cmd_Exec_f
===============
*/
void Cmd_Exec_f( void ) {
qboolean quiet;
union {
char *c;
void *v;
} f;
char filename[MAX_QPATH];
quiet = !Q_stricmp(Cmd_Argv(0), "execq");
if (Cmd_Argc () != 2) {
Com_Printf ("exec <filename> : execute a script file\n");
Com_Printf ("exec%s <filename> : execute a script file%s\n",
quiet ? "q" : "", quiet ? " without notification" : "");
return;
}
@ -280,10 +284,11 @@ void Cmd_Exec_f( void ) {
COM_DefaultExtension( filename, sizeof( filename ), ".cfg" );
FS_ReadFile( filename, &f.v);
if (!f.c) {
Com_Printf ("couldn't exec %s\n",Cmd_Argv(1));
Com_Printf ("couldn't exec %s\n", filename);
return;
}
Com_Printf ("execing %s\n",Cmd_Argv(1));
if (!quiet)
Com_Printf ("execing %s\n", filename);
Cbuf_InsertText (f.c);
@ -853,7 +858,9 @@ Cmd_Init
void Cmd_Init (void) {
Cmd_AddCommand ("cmdlist",Cmd_List_f);
Cmd_AddCommand ("exec",Cmd_Exec_f);
Cmd_AddCommand ("execq",Cmd_Exec_f);
Cmd_SetCommandCompletionFunc( "exec", Cmd_CompleteCfgName );
Cmd_SetCommandCompletionFunc( "execq", Cmd_CompleteCfgName );
Cmd_AddCommand ("vstr",Cmd_Vstr_f);
Cmd_SetCommandCompletionFunc( "vstr", Cvar_CompleteCvarName );
Cmd_AddCommand ("echo",Cmd_Echo_f);