From: neumond <knifeslaughter@gmail.com>
Date: Mon, 30 Jun 2014 22:24:10 +0000 (+0400)
Subject: load all tex-* paks, remove VFS double start
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=08f880fdc0b34f5060ef22399a6df62cabe3a6a8;p=xonotic%2Fnetradiant.git

load all tex-* paks, remove VFS double start
---

diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index 9ec85fd8..ea786030 100644
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -826,15 +826,31 @@ void initialise(){
 		const char* pakname;
 		g_loaded_unv_paks.clear();
 
-		pakname = GetLatestVersionOfUnvPak( "tex-common" );
-		if ( pakname ) LoadPakWithDeps( pakname );
-
 		pakname = GetLatestVersionOfUnvPak( "radiant" );
 		if ( pakname ) LoadPakWithDeps( pakname );
 
-		pakname = GetCurrentMapPakName();
-		if ( pakname && !string_empty( pakname ) ) {
-			LoadPakWithDeps( pakname );
+		// prevent VFS double start, for MapName="" and MapName="unnamed.map"
+		if ( string_length( GlobalRadiant().getMapName() ) ){
+			// map's tex-* paks have precedence over any other tex-* paks
+			char* mappakname = GetCurrentMapPakName();
+			if ( mappakname ) {
+				LoadPakWithDeps( mappakname );
+				string_release( mappakname, string_length( mappakname ) );
+			}
+
+			for ( PakfilePaths::iterator i = g_pakfile_paths.begin(); i != g_pakfile_paths.end(); ++i ) {
+				if ( strncmp( i->first.c_str(), "tex-", 4 ) != 0 ) continue;
+				// firstly load latest version of pak
+				const char *paknamever = i->first.c_str();
+				const char *c = strchr( paknamever, '_' );
+				char *paknameonly;
+				if ( c ) paknameonly = string_clone_range( StringRange( paknamever, c ) );
+				pakname = GetLatestVersionOfUnvPak( paknameonly );
+				LoadPakWithDeps( pakname );
+				if ( c ) string_release( paknameonly, string_length( paknameonly ) );
+				// then load this specific version
+				LoadPakWithDeps( paknamever );
+			}
 		}
 
 		g_pakfile_paths.clear();