From fa7a4882acf1100ffe895a7a4a9c823a2a04af0f Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Mon, 22 May 2000 07:10:16 +0000 Subject: [PATCH] *sigh* --- source/math.S | 4 +- source/mathlib.c | 4 +- source/model.c | 3 +- source/nonintel.c | 3 +- source/pr_edict.c | 3 +- source/quakefs.c | 181 ---------------------------------------------- 6 files changed, 6 insertions(+), 192 deletions(-) diff --git a/source/math.S b/source/math.S index 0d1aed8..1061131 100644 --- a/source/math.S +++ b/source/math.S @@ -1,7 +1,7 @@ /* math.S - (description) + x86 assembly-language math routines. Copyright (C) 1996-1997 Id Software, Inc. @@ -25,8 +25,6 @@ $Id$ */ -// math.s -// x86 assembly-language math routines. #ifdef HAVE_CONFIG_H # include diff --git a/source/mathlib.c b/source/mathlib.c index fc21cff..2973852 100644 --- a/source/mathlib.c +++ b/source/mathlib.c @@ -1,7 +1,7 @@ /* mathlib.c - (description) + math primitives Copyright (C) 1996-1997 Id Software, Inc. @@ -25,7 +25,6 @@ $Id$ */ -// mathlib.c -- math primitives #ifdef HAVE_CONFIG_H # include @@ -34,6 +33,7 @@ #include "qtypes.h" #include "mathlib.h" #include "model.h" + void Sys_Error (char *error, ...); vec3_t vec3_origin = {0,0,0}; diff --git a/source/model.c b/source/model.c index b297c2f..c4708a0 100644 --- a/source/model.c +++ b/source/model.c @@ -1,7 +1,7 @@ /* model.c - (description) + model loading and caching Copyright (C) 1996-1997 Id Software, Inc. @@ -25,7 +25,6 @@ $Id$ */ -// models.c -- model loading and caching // models are the only shared resource between a client and server running // on the same machine. diff --git a/source/nonintel.c b/source/nonintel.c index 35ee42b..a5e0ae2 100644 --- a/source/nonintel.c +++ b/source/nonintel.c @@ -1,7 +1,7 @@ /* nonintel.c - (description) + code for non-Intel processors only Copyright (C) 1996-1997 Id Software, Inc. @@ -25,7 +25,6 @@ $Id$ */ -// nonintel.c: code for non-Intel processors only #ifdef HAVE_CONFIG_H # include diff --git a/source/pr_edict.c b/source/pr_edict.c index 1168b62..2f07bcb 100644 --- a/source/pr_edict.c +++ b/source/pr_edict.c @@ -1,7 +1,7 @@ /* pr_edict.c - (description) + entity dictionary Copyright (C) 1996-1997 Id Software, Inc. @@ -25,7 +25,6 @@ $Id$ */ -// sv_edict.c -- entity dictionary #ifdef HAVE_CONFIG_H # include diff --git a/source/quakefs.c b/source/quakefs.c index 5914404..b5afa11 100644 --- a/source/quakefs.c +++ b/source/quakefs.c @@ -4,9 +4,6 @@ virtual filesystem functions Copyright (C) 1996-1997 Id Software, Inc. - Copyright (C) 1999,2000 Nelson Rush. - Copyright (C) 1999,2000 contributors of the QuakeForge project - Please see the file "AUTHORS" for a list of contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -108,15 +105,6 @@ char gamedirfile[MAX_OSPATH]; cvar_t *fs_userpath; cvar_t *fs_sharepath; -#ifdef GENERATIONS -#include -typedef unsigned char byte_t; - -#ifndef _AIX -typedef unsigned int uint_t; -typedef unsigned short ushort_t; -#endif -#endif int com_filesize; @@ -425,14 +413,6 @@ COM_FOpenFile (char *filename, QFile **gzfile) pack_t *pak; int i; int findtime; -#ifdef HAS_ZLIB - char gzfilename[MAX_OSPATH]; - int filenamelen;; - - filenamelen = strlen(filename); - strncpy(gzfilename,filename,sizeof(gzfilename)); - strncat(gzfilename,".gz",sizeof(gzfilename)); -#endif file_from_pak = 0; @@ -448,17 +428,8 @@ COM_FOpenFile (char *filename, QFile **gzfile) pak = search->pack; for (i=0 ; inumfiles ; i++) { char *fn=0; -#ifdef HAS_ZLIB - if (!strncmp(pak->files[i].name, filename, filenamelen)) { - if (!pak->files[i].name[filenamelen]) - fn=filename; - else if (!strcmp (pak->files[i].name, gzfilename)) - fn=gzfilename; - } -#else if (!strcmp (pak->files[i].name, filename)) fn=filename; -#endif if (fn) { // found it! if (developer->value) @@ -479,12 +450,6 @@ COM_FOpenFile (char *filename, QFile **gzfile) findtime = Sys_FileTime (netpath); if (findtime == -1) { -#ifdef HAS_ZLIB - snprintf(netpath, sizeof(netpath), "%s/%s",search->filename, - gzfilename); - findtime = Sys_FileTime (netpath); - if (findtime == -1) -#endif continue; } @@ -656,135 +621,6 @@ COM_LoadPackFile (char *packfile) return pack; } -#ifdef GENERATIONS -int -COM_pakzip_checkfile(unzFile *pak, const char *path) -{ - int status; - - status = unzLocateFile(pak, path, 2); - return (status == UNZ_OK); -} - -void -COM_pakzip_closepak(unzFile *pak) -{ - if (pak) - unzClose(pak); - pak = NULL; -} - -void -COM_pakzip_close(unzFile *pak) -{ - unzCloseCurrentFile(pak); -} - -int -COM_pakzip_read(unzFile *pak, void *buf, uint_t size, uint_t nmemb) -{ - int len = unzReadCurrentFile(pak, buf, size * nmemb); - return len / size; -} - -int -COM_pakzip_open(unzFile *pak, const char *path) -{ - if (unzLocateFile(pak, path, 2) != UNZ_OK) - return 0; - if (unzOpenCurrentFile(pak) != UNZ_OK) - return 0; - return 1; -} - -uint_t -COM_pakzip_getlen(unzFile *pak) -{ - unz_file_info info; - - if (unzGetCurrentFileInfo(pak, &info, NULL, 0, NULL, 0, NULL, 0) - != UNZ_OK) - return 0; - return info.uncompressed_size; -} - -uint_t -COM_pakzip_readfile(unzFile *pak, const char *path, uint_t bufsize, byte_t *buf) -{ - uint_t len; - - if (!COM_pakzip_open(pak,path)) - return 0; - - if ((len = COM_pakzip_getlen(pak)) != 0) - { - if (COM_pakzip_read(pak, (void*)buf, 1, len) != len) - len = 0; - } - COM_pakzip_close(pak); - return len; -} - - -pack_t * -COM_LoadPackZipFile (char *packfile) -{ - int i=0; - packfile_t *newfiles; - float numpackfiles; - unzFile *pak; - pack_t *pack_old; - int status; - -// This following variable info is unused ATM. -// dpackfile_t info[MAX_FILES_IN_PACK]; - char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1]; - - pak = unzOpen(packfile); - - numpackfiles = 0; - Con_Printf ("Assigned Numpackfiles\n"); - - if (!pak) - return NULL; - - newfiles = Hunk_AllocName (numpackfiles * sizeof(unzFile), "packfile"); - - status=unzGoToFirstFile(pak); - - while(status == UNZ_OK) { -// unzGetCurrentFileInfo(pak,NULL,&szCurrentFileName,64,NULL,0,NULL,0); - - if(strcmp(newfiles[i].name, szCurrentFileName)==0) - break; - - strcpy (newfiles[i].name, szCurrentFileName); - Con_Printf ("strcpy'ed %s into newfiles[%i].name Ok\n",szCurrentFileName, i); - - newfiles[i].filepos = LittleLong(unztell(pak)); -// newfiles[i].filelen = LittleLong(COM_pak3_readfile(pak,packfile,64,64)); - - Con_Printf ("Added File\n"); - status=unzGoToNextFile(pak); - ++numpackfiles; - ++i; - } - - Con_Printf ("Added files in %s to game data Ok\n", packfile); - - pack_old = Hunk_Alloc (sizeof (pack_t)); - strcpy (pack_old->filename, packfile); - //pack_old->handle = unzGetLocalExtrafield(packfile, NULL, NULL); - pack_old->numfiles = numpackfiles; - pack_old->files = newfiles; - - Con_Printf ("Added packfile %s (%.0f files)\n", packfile, numpackfiles); - - COM_pakzip_close(pak); - return pack_old; -} -#endif - #define FBLOCK_SIZE 32 #define FNAME_SIZE MAX_OSPATH @@ -888,23 +724,6 @@ COM_LoadGameDirectory_free: for (i = 0; i < count; i++) free(pakfiles[i]); free(pakfiles); - -#ifdef GENERATIONS - for (done=false, i=0 ; !done ; i++ ) { - snprintf(pakfile, sizeof(pakfile), "%s/pak%i.qz", dir, i); - - pak = COM_LoadPackZipFile(pakfile); - - if(!pak) { - done = true; - } else { - search = Hunk_Alloc (sizeof(searchpath_t)); - search->pack = pak; - search->next = com_searchpaths; - com_searchpaths = search; - } - } -#endif } /*