fix q3map2 pak sorting

tools/quake3/common/vfs.c

@@ -164,13 +164,56 @@ static void vfsInitPakFile( const char *filename ){
 	}
 }
 
+static int vfsPakSort(const void *a, const void *b) {
+	char    *s1, *s2;
+	int c1, c2;
+
+	s1 = (char*)a;
+	s2 = (char*)b;
+
+	do {
+		c1 = *s1++;
+		c2 = *s2++;
+
+		if (c1 >= 'a' && c1 <= 'z') {
+			c1 -= ('a' - 'A');
+		}
+		if (c2 >= 'a' && c2 <= 'z') {
+			c2 -= ('a' - 'A');
+		}
+
+		if (c1 == '\\' || c1 == ':') {
+			c1 = '/';
+		}
+		if (c2 == '\\' || c2 == ':') {
+			c2 = '/';
+		}
+
+		// Arnout: note - sort pakfiles in reverse order. This ensures that
+		// later pakfiles override earlier ones. This because the vfs module
+		// returns a filehandle to the first file it can find (while it should
+		// return the filehandle to the file in the most overriding pakfile, the
+		// last one in the list that is).
+		if (c1 < c2) {
+			//return -1;		// strings not equal
+			return 1;       // strings not equal
+		}
+		if (c1 > c2) {
+			//return 1;
+			return -1;
+		}
+	} while (c1);
+
+	return 0;       // strings are equal
+}
+
 // =============================================================================
 // Global functions
 
 // reads all pak files from a dir
 void vfsInitDirectory( const char *path ){
 	char filename[PATH_MAX];
-	char *dirlist;
+	GSList *dirlist = NULL;
 	GDir *dir;
 
 	if ( g_numDirs == ( VFS_MAXDIRS - 1 ) ) {
@@ -188,6 +231,7 @@ void vfsInitDirectory( const char *path ){
 		dir = g_dir_open( path, 0, NULL );
 
 		if ( dir != NULL ) {
+
 			while(1)
 			{
 				const char* name = g_dir_read_name(dir);
@@ -195,10 +239,21 @@ void vfsInitDirectory( const char *path ){
 					break;
 				}
 
-				dirlist = g_strdup( name );
+				char* direntry = g_strdup(name);
+				dirlist = g_slist_append(dirlist, direntry);
+			}
 
+			dirlist = g_slist_sort(dirlist, vfsPakSort);
+
+			while ( dirlist )
 			{
-					char *ext = strrchr( dirlist, '.' );
+				GSList *cur = dirlist;
+				char* name = (char*)cur->data;
+				if ( name == NULL ) {
+					break;
+				}
+
+				char *ext = strrchr(name, '.' );
 
 				if ( ext != NULL && ( !Q_stricmp( ext, ".pk3dir" ) || !Q_stricmp( ext, ".dpkdir" ) ) ) {
 					if ( g_numDirs == VFS_MAXDIRS ) {
@@ -211,15 +266,13 @@ void vfsInitDirectory( const char *path ){
 					++g_numDirs;
 				}
 
-					if ( ext == NULL || ( Q_stricmp( ext, ".pk3" ) != 0 && Q_stricmp( ext, ".dpk" ) != 0 ) ) {
+				if ( ext != NULL && ( !Q_stricmp( ext, ".pk3" ) || !Q_stricmp( ext, ".dpk" )) ) {
-						continue;
+					sprintf(filename, "%s/%s", path, name);
-					}
-				}
-
-				sprintf( filename, "%s/%s", path, dirlist );
 					vfsInitPakFile(filename);
+				}
 
-				g_free( dirlist );
+				g_free(name);
+				dirlist = g_slist_remove(cur, name);
 			}
 			g_dir_close( dir );
 		}