From: Mario <zacjardine@y7mail.com>
Date: Wed, 12 Jul 2017 20:52:35 +0000 (+0000)
Subject: Merge branch 'fixpk3' into 'master'
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=07d0b8aa640d00454991ea04c61b4e460de03ea3;hp=33c1fb60da3357af527a46ed06995e808853b9ff

Merge branch 'fixpk3' into 'master'

[regression] fix pk3 archive loading [currently broken]

See merge request !49
---

diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index e92bad76..a76fafba 100644
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -660,7 +660,7 @@ void InitDirectory( const char* directory, ArchiveModules& archiveModules ){
 				for ( Archives::iterator i = archives.begin(); i != archives.end(); ++i ) {
 					const char* name = i->c_str();
 					const char* ext = strrchr( name, '.' );
-					if ( !string_compare_nocase_upper( ext, "dpk" ) ) {
+					if ( !string_compare_nocase_upper( ext, ".dpk" ) ) {
 						CopiedString name_final = CopiedString( StringRange( name, ext ) );
 						fullpath = string_new_concat( path, name );
 						AddDpkPak( name_final.c_str(), fullpath, true );
@@ -673,8 +673,8 @@ void InitDirectory( const char* directory, ArchiveModules& archiveModules ){
 				{
 					const char* name = i->c_str();
 					const char* ext = strrchr( name, '.' );
-					if ( !string_compare_nocase_upper( ext, "pk3" )
-						|| !string_compare_nocase_upper( ext, "pk4" ) ) {
+					if ( !string_compare_nocase_upper( ext, ".pk3" )
+						|| !string_compare_nocase_upper( ext, ".pk4" ) ) {
 						fullpath = string_new_concat( path, i->c_str() );
 						InitPakFile( archiveModules, fullpath );
 						string_release( fullpath, string_length( fullpath ) );
@@ -684,8 +684,8 @@ void InitDirectory( const char* directory, ArchiveModules& archiveModules ){
 				{
 					const char* name = i->c_str();
 					const char* ext = strrchr( name, '.' );
-					if ( !string_compare_nocase_upper( ext, "pk3" )
-						|| !string_compare_nocase_upper( ext, "pk4" ) ) {
+					if ( !string_compare_nocase_upper( ext, ".pk3" )
+						|| !string_compare_nocase_upper( ext, ".pk4" ) ) {
 						fullpath = string_new_concat( path, i->c_str() );
 						InitPakFile( archiveModules, fullpath );
 						string_release( fullpath, string_length( fullpath ) );