qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-06-01 09:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

A few fixes to my previous patches. Including the small compile-breaker that I accidently threw in by putting an important global variable in a rarely used define (generations).

Browse source
This commit is contained in:
Eric Windisch 2000-03-04 02:39:12 +00:00
parent 45ccae6ba7
commit 8b55f440df
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/quakefs.c
View file

@ -61,10 +61,11 @@ QUAKE FILESYSTEM
============================================================================= =============================================================================
*/ */
char gamedirfile[MAX_OSPATH];
#ifdef GENERATIONS #ifdef GENERATIONS
#include <unzip.h> #include <unzip.h>
typedef unsigned char byte_t; typedef unsigned char byte_t;
char gamedirfile[MAX_OSPATH];
#ifndef _AIX #ifndef _AIX
typedef unsigned int uint_t; typedef unsigned int uint_t;
@ -616,7 +617,7 @@ pack_t *COM_LoadPackZipFile (char *packfile)
// This following variable info is unused ATM. // This following variable info is unused ATM.
// dpackfile_t info[MAX_FILES_IN_PACK]; // dpackfile_t info[MAX_FILES_IN_PACK];
char szCurrentFileName[256]; char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
pak = unzOpen(packfile); pak = unzOpen(packfile);

3
common/unzip.c
View file

@ -35,7 +35,7 @@
#define CASESENSITIVITYDEFAULT_NO #define CASESENSITIVITYDEFAULT_NO
#endif #endif
#if 0
#ifndef UNZ_BUFSIZE #ifndef UNZ_BUFSIZE
#define UNZ_BUFSIZE (16384) #define UNZ_BUFSIZE (16384)
#endif #endif
@ -43,6 +43,7 @@
#ifndef UNZ_MAXFILENAMEINZIP #ifndef UNZ_MAXFILENAMEINZIP
#define UNZ_MAXFILENAMEINZIP (256) #define UNZ_MAXFILENAMEINZIP (256)
#endif #endif
#endif
#ifndef ALLOC #ifndef ALLOC
# define ALLOC(size) (malloc(size)) # define ALLOC(size) (malloc(size))

8
common/unzip.h
View file

@ -49,6 +49,14 @@ extern "C" {
#include <zlib.h> #include <zlib.h>
#endif #endif
#ifndef UNZ_BUFSIZE
#define UNZ_BUFSIZE (16384)
#endif
#ifndef UNZ_MAXFILENAMEINZIP
#define UNZ_MAXFILENAMEINZIP (256)
#endif
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted /* like the STRICT of WIN32, we define a pointer that cannot be converted
from (void*) without cast */ from (void*) without cast */