Switch to minizip

[xonotic/netradiant.git] / tools / quake3 / common / vfs.c

diff --git a/tools/quake3/common/vfs.c b/tools/quake3/common/vfs.c
index ada7ee713c14d8548e51b273e7e119a95401157d..e0cd888fb46e0ea5ae2746c243127205cf58f763 100644 (file)
--- a/tools/quake3/common/vfs.c
+++ b/tools/quake3/common/vfs.c
@@ -50,12 +50,11 @@
 #include "mathlib.h"
 #include "inout.h"
 #include "vfs.h"
-#include "unzip.h"
+#include <minizip/unzip.h>
 
 typedef struct
 {
        char*   name;
-       unz_s zipinfo;
        unzFile zipfile;
        guint32 size;
 } VFS_PAKFILE;
@@ -139,7 +138,6 @@ static void vfsInitPakFile( const char *filename ){
                file->name = strdup( filename_inzip );
                file->size = file_info.uncompressed_size;
                file->zipfile = uf;
-               memcpy( &file->zipinfo, uf, sizeof( unz_s ) );
 
                if ( ( i + 1 ) < gi.number_entry ) {
                        err = unzGoToNextFile( uf );
@@ -218,7 +216,7 @@ void vfsInitDirectory( const char *path ){
                                {
                                        char *ext = strrchr( dirlist, '.' );
 
-                                       if ( ext && !Q_stricmp( ext, ".pk3dir" ) ) {
+                                       if ( ext && ( !Q_stricmp( ext, ".pk3dir" ) || !Q_stricmp( ext, ".dpkdir" ) ) ) {
                                                if ( g_numDirs == VFS_MAXDIRS ) {
                                                        continue;
                                                }
@@ -229,7 +227,7 @@ void vfsInitDirectory( const char *path ){
                                                ++g_numDirs;
                                        }
 
-                                       if ( ( ext == NULL ) || ( Q_stricmp( ext, ".pk3" ) != 0 ) ) {
+                                       if ( ( ext == NULL ) || ( Q_stricmp( ext, ".pk3" ) != 0 || !Q_stricmp( ext, ".dpk" ) != 0 ) ) {
                                                continue;
                                        }
                                }
@@ -384,7 +382,6 @@ int vfsLoadFile( const char *filename, void **bufferptr, int index ){
                }
 
                if ( count == index ) {
-                       memcpy( file->zipfile, &file->zipinfo, sizeof( unz_s ) );
 
                        if ( unzOpenCurrentFile( file->zipfile ) != UNZ_OK ) {
                                return -1;