Only list PAK BSPs in maps dir

e.g. filter out AD's maps/bmodels or maps/xxx_brk
andrei-drexler · Sep 4, 2022 · 65479e8 · 65479e8
1 parent f776863
commit 65479e8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c
@@ -187,13 +187,13 @@ void ExtraMaps_Init (void)
 			{ //don't list standard id maps
 				for (i = 0, pak = search->pack; i < pak->numfiles; i++)
 				{
-					if (!strcmp(COM_FileGetExtension(pak->files[i].name), "bsp"))
+					if (pak->files[i].filelen > 32*1024 &&				// don't list files under 32k (ammo boxes etc)
+						!strncmp (pak->files[i].name, "maps/", 5) &&	// don't list files outside of maps/
+						!strchr (pak->files[i].name + 5, '/') &&		// don't list files in subdirectories
+						!strcmp (COM_FileGetExtension (pak->files[i].name), "bsp"))
 					{
-						if (pak->files[i].filelen > 32*1024)
-						{ // don't list files under 32k (ammo boxes etc)
-							COM_StripExtension(pak->files[i].name + 5, mapname, sizeof(mapname));
-							ExtraMaps_Add (mapname);
-						}
+						COM_StripExtension(pak->files[i].name + 5, mapname, sizeof(mapname));
+						ExtraMaps_Add (mapname);
 					}
 				}
 			}