Garux: renamed disable defines

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

diff --git a/tools/quake3/common/vfs.c b/tools/quake3/common/vfs.c
index 474cb8e6033b6ce7e55557612c02492db88a2b24..48a1f86fbde046b5b81b411cb15f18167991125e 100644 (file)
--- a/tools/quake3/common/vfs.c
+++ b/tools/quake3/common/vfs.c
@@ -52,8 +52,8 @@
 #include "vfs.h"
 #include <minizip/unzip.h>
 #include <glib.h>
-#define BAD_MINIZ
-#ifndef BAD_MINIZ
+#define GARUX_DISABLE_BAD_MINIZ
+#ifndef GARUX_DISABLE_BAD_MINIZ
 #include "miniz.h"
 #endif
 
@@ -495,8 +495,8 @@ int vfsLoadFile( const char *filename, void **bufferptr, int index ){
 }
 
 
-qboolean vfsPackFile( const char *filename, const char *packname ){
-#ifndef BAD_MINIZ
+qboolean vfsPackFile( const char *filename, const char *packname, const int compLevel ){
+#ifndef GARUX_DISABLE_BAD_MINIZ
        int i;
        char tmp[NAME_MAX], fixed[NAME_MAX];
        GSList *lst;
@@ -518,7 +518,7 @@ qboolean vfsPackFile( const char *filename, const char *packname ){
                                mz_zip_writer_init_from_reader( &zip, packname );
 
                                mz_bool success = MZ_TRUE;
-                               success &= mz_zip_writer_add_file( &zip, filename, tmp, 0, 0, 10 );
+                               success &= mz_zip_writer_add_file( &zip, filename, tmp, 0, 0, compLevel );
                                if ( !success || !mz_zip_writer_finalize_archive( &zip ) ){
                                        Error( "Failed creating zip archive \"%s\"!\n", packname );
                                }
@@ -532,7 +532,7 @@ qboolean vfsPackFile( const char *filename, const char *packname ){
                                        Error( "Failed creating zip archive \"%s\"!\n", packname );
                                }
                                mz_bool success = MZ_TRUE;
-                               success &= mz_zip_writer_add_file( &zip, filename, tmp, 0, 0, 10 );
+                               success &= mz_zip_writer_add_file( &zip, filename, tmp, 0, 0, compLevel );
                                if ( !success || !mz_zip_writer_finalize_archive( &zip ) ){
                                        Error( "Failed creating zip archive \"%s\"!\n", packname );
                                }
@@ -561,6 +561,9 @@ qboolean vfsPackFile( const char *filename, const char *packname ){
                // we need to end the buffer with a 0
                ( (char*) ( bufferptr ) )[file->size] = 0;
 
+               mz_uint16 DOS_time = (mz_uint16)(((file->zipinfo.cur_file_info.tmu_date.tm_hour) << 11) + ((file->zipinfo.cur_file_info.tmu_date.tm_min) << 5) + ((file->zipinfo.cur_file_info.tmu_date.tm_sec) >> 1));
+               mz_uint16 DOS_date = (mz_uint16)(((file->zipinfo.cur_file_info.tmu_date.tm_year - 1980) << 9) + ((file->zipinfo.cur_file_info.tmu_date.tm_mon + 1) << 5) + file->zipinfo.cur_file_info.tmu_date.tm_mday);
+
                i = unzReadCurrentFile( file->zipfile, bufferptr, file->size );
                unzCloseCurrentFile( file->zipfile );
                if ( i < 0 ) {
@@ -568,7 +571,7 @@ qboolean vfsPackFile( const char *filename, const char *packname ){
                }
                else{
                        mz_bool success = MZ_TRUE;
-                       success &= mz_zip_add_mem_to_archive_file_in_place( packname, filename, bufferptr, i, 0, 0, 10 );
+                       success &= mz_zip_add_mem_to_archive_file_in_place_with_time( packname, filename, bufferptr, i, 0, 0, compLevel, DOS_time, DOS_date );
                                if ( !success ){
                                        Error( "Failed creating zip archive \"%s\"!\n", packname );
                                }