X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=bbaca649369e1e5be7b88e3251d019894db88ce0;hb=7c586d061e7308e0e8164827fa0e14b470921d67;hp=a395eed658b9a65d8c95517ed3fb53e0820de83a;hpb=b1a8aaaee6d26247423e17d2a2ba8ea1cc9692a8;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.c b/cmd.c
index a395eed6..bbaca649 100644
--- a/cmd.c
+++ b/cmd.c
@@ -450,24 +450,10 @@ void Cmd_StuffCmds_f (void)
 	Cbuf_InsertText (build);
 }
 
-
-/*
-===============
-Cmd_Exec_f
-===============
-*/
-static void Cmd_Exec_f (void)
+static void Cmd_Exec(const char *filename)
 {
 	char *f;
-	const char *filename;
-
-	if (Cmd_Argc () != 2)
-	{
-		Con_Print("exec <filename> : execute a script file\n");
-		return;
-	}
 
-	filename = Cmd_Argv(1);
 	if (!strcmp(filename, "config.cfg"))
 	{
 		filename = CONFIGFILENAME;
@@ -514,6 +500,35 @@ static void Cmd_Exec_f (void)
 		Cbuf_InsertText("\nr_shadow_gloss 2\nr_shadow_bumpscale_basetexture 4\n\n");
 }
 
+/*
+===============
+Cmd_Exec_f
+===============
+*/
+static void Cmd_Exec_f (void)
+{
+	fssearch_t *s;
+	int i;
+
+	if (Cmd_Argc () != 2)
+	{
+		Con_Print("exec <filename> : execute a script file\n");
+		return;
+	}
+
+	s = FS_Search(Cmd_Argv(1), true, true);
+	if(!s || !s->numfilenames)
+	{
+		Con_Printf("couldn't exec %s\n",Cmd_Argv(1));
+		return;
+	}
+
+	for(i = 0; i < s->numfilenames; ++i)
+		Cmd_Exec(s->filenames[i]);
+
+	FS_FreeSearch(s);
+}
+
 
 /*
 ===============