X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=filematch.c;h=e06439614c2174927168128adf5b1fcbe8fa268d;hb=1dfb76a50d855048ba125cbea61489d39535e7f4;hp=59e626d2a9ee9d77c522aae2744382441ce44d25;hpb=1339d6a876c75a1224d93cdb75e12e5d6486a3d0;p=xonotic%2Fdarkplaces.git

diff --git a/filematch.c b/filematch.c
index 59e626d2..e0643961 100644
--- a/filematch.c
+++ b/filematch.c
@@ -5,9 +5,9 @@
 #include <dirent.h>
 #endif
 
-#include "quakedef.h"
+#include "darkplaces.h"
 
-// LordHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such...
+// LadyHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such...
 
 int matchpattern(const char *in, const char *pattern, int caseinsensitive)
 {
@@ -16,7 +16,7 @@ int matchpattern(const char *in, const char *pattern, int caseinsensitive)
 
 // wildcard_least_one: if true * matches 1 or more characters
 //                     if false * matches 0 or more characters
-int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qboolean wildcard_least_one)
+int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qbool wildcard_least_one)
 {
 	int c1, c2;
 	while (*pattern)
@@ -122,7 +122,7 @@ static int stringlistsort_cmp(const void *a, const void *b)
 	return strcasecmp(*(const char **)a, *(const char **)b);
 }
 
-void stringlistsort(stringlist_t *list, qboolean uniq)
+void stringlistsort(stringlist_t *list, qbool uniq)
 {
 	int i, j;
 	if(list->numstrings < 1)
@@ -164,8 +164,7 @@ static void adddirentry(stringlist_t *list, const char *path, const char *name)
 #ifdef WIN32
 void listdirectory(stringlist_t *list, const char *basepath, const char *path)
 {
-	int i;
-	char pattern[4096], *c;
+	char pattern[4096];
 	WIN32_FIND_DATA n_file;
 	HANDLE hFile;
 	strlcpy (pattern, basepath, sizeof(pattern));
@@ -179,12 +178,6 @@ void listdirectory(stringlist_t *list, const char *basepath, const char *path)
 		adddirentry(list, path, n_file.cFileName);
 	} while (FindNextFile(hFile, &n_file) != 0);
 	FindClose(hFile);
-
-	// convert names to lowercase because windows does not care, but pattern matching code often does
-	for (i = 0;i < list->numstrings;i++)
-		for (c = list->strings[i];*c;c++)
-			if (*c >= 'A' && *c <= 'Z')
-				*c += 'a' - 'A';
 }
 #else
 void listdirectory(stringlist_t *list, const char *basepath, const char *path)