From a0c7a347dfe89744f3519c8f9cdcbe7d41e99a54 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 26 Dec 2006 18:21:22 +0000 Subject: [PATCH] Should fix some gcc 64bit issues. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2450 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/fs.c | 6 ++++-- engine/common/protocol.h | 1 + engine/common/unzip.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/engine/common/fs.c b/engine/common/fs.c index 0e0f0918c..05461fda2 100644 --- a/engine/common/fs.c +++ b/engine/common/fs.c @@ -1041,11 +1041,13 @@ static void *FSZIP_LoadZipFile (vfsfile_t *packhandle, char *desc) zip->files = newfiles = Z_Malloc (zip->numfiles * sizeof(packfile_t)); for (i = 0; i < zip->numfiles; i++) { - unzGetCurrentFileInfo (zip->handle, &file_info, newfiles[i].name, sizeof(newfiles[i].name), NULL, 0, NULL, 0); + if (unzGetCurrentFileInfo (zip->handle, &file_info, newfiles[i].name, sizeof(newfiles[i].name), NULL, 0, NULL, 0) != UNZ_OK) + Con_Printf("Zip Error\n"); Q_strlwr(newfiles[i].name); newfiles[i].filelen = file_info.uncompressed_size; newfiles[i].filepos = file_info.c_offset; - unzGoToNextFile (zip->handle); + if (unzGoToNextFile (zip->handle) != UNZ_OK) + Con_Printf("Zip Error\n"); } zip->references = 1; diff --git a/engine/common/protocol.h b/engine/common/protocol.h index a5182f8f7..25370139c 100644 --- a/engine/common/protocol.h +++ b/engine/common/protocol.h @@ -409,6 +409,7 @@ enum clcq2_ops_e // the first 16 bits of a packetentities update holds 9 bits // of entity number and 7 bits of flags +#define U_UNUSABLE (1<<8) #define U_ORIGIN1 (1<<9) #define U_ORIGIN2 (1<<10) #define U_ORIGIN3 (1<<11) diff --git a/engine/common/unzip.c b/engine/common/unzip.c index 04307d6ff..08db8af34 100644 --- a/engine/common/unzip.c +++ b/engine/common/unzip.c @@ -142,7 +142,7 @@ local int unzlocal_getShort(vfsfile_t *fin,unsigned long *pi) { } local int unzlocal_getLong(vfsfile_t *fin,unsigned long *pi) { - unsigned long c; + unsigned int c; int err = VFS_READ(fin, &c, 4); if (err==4) { *pi = LittleLong(c);