Merge remote-tracking branch 'yquake2/master'

src/client/menu/menu.c

@@ -5793,7 +5793,7 @@ PlayerModelList(void)
 		}
 
 		/* sort skin names alphabetically */
-		qsort(s_skinnames[mdl].data, s_skinnames[mdl].num, sizeof(char**), Q_sort_strcomp);
+		qsort(s_skinnames[mdl].data, s_skinnames[mdl].num, sizeof(char**), Q_sort_stricmp);
 
 		/* at this point we have a valid player model */
 		s = (char*)malloc(MAX_DISPLAYNAME);

src/common/filesystem.c

@@ -1355,16 +1355,16 @@ Q_sort_modcmp(const void *p1, const void *p2)
 
 	for (unsigned short int i = 0; i < first_mods_qty; i++)
 	{
-		if (!strcmp(first_mods[i], s1))
+		if (!Q_stricmp(first_mods[i], s1))
 		{
 			return -1;
 		}
-		if (!strcmp(first_mods[i], s2))
+		if (!Q_stricmp(first_mods[i], s2))
 		{
 			return 1;
 		}
 	}
-	return strcmp(s1, s2);
+	return Q_stricmp(s1, s2);
 }
 
 /*

src/common/header/shared.h

@@ -338,6 +338,9 @@ int Q_strlcat(char *dst, const char *src, int size);
 /* Unicode wrappers that also make sure it's a regular file around fopen(). */
 FILE *Q_fopen(const char *file, const char *mode);
 
+/* Comparator function for qsort(), compares case-insensitive strings. */
+int Q_sort_stricmp(const void *s1, const void *s2);
+
 /* Comparator function for qsort(), compares strings. */
 int Q_sort_strcomp(const void *s1, const void *s2);
 

src/common/shared/shared.c

@@ -1188,6 +1188,12 @@ FILE *Q_fopen(const char *file, const char *mode)
 }
 #endif
 
+int
+Q_sort_stricmp(const void *s1, const void *s2)
+{
+	return Q_stricmp(*(char**)s1, *(char**)s2);
+}
+
 int
 Q_sort_strcomp(const void *s1, const void *s2)
 {