From: Thomas Debesse <dev@illwieckz.net>
Date: Sun, 26 Mar 2017 01:44:21 +0000 (+0200)
Subject: do not load tex-* dpk by default, only rely on map DEPS
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a0a1965204476734c1279dacc02e19652ca0a0a0;p=xonotic%2Fnetradiant.git

do not load tex-* dpk by default, only rely on map DEPS
---

diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index 7851210a..e92bad76 100644
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -862,28 +862,12 @@ void initialise(){
 
 		// 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
+			// load map's paks from DEPS
 			char* mappakname = GetCurrentMapDpkPakName();
 			if ( mappakname != NULL ) {
 				LoadDpkPakWithDeps( 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 = GetLatestDpkPakVersion( paknameonly );
-				if (pakname != NULL) {
-					LoadDpkPakWithDeps( pakname );
-				}
-				if ( c ) string_release( paknameonly, string_length( paknameonly ) );
-				// then load this specific version
-				LoadDpkPakWithDeps( paknamever );
-			}
 		}
 
 		g_pakfile_paths.clear();