qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-02 04:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove the non-hashtable lookup code from _COM_FOpenFile. While it seemed the

Browse source 
linear search was just slightly faster even for mega2k (~0.3s / 22.5) this is
probably partly due to the cost of initializing the hash tables in the first
place and thus gains might be noticed on subsequent map changes. Also, the
new hash code is much simpler and easier to read/maintain. Enough of a boon
right there :)
This commit is contained in:
Bill Currie 2001-01-30 06:54:02 +00:00
parent f0c0dd28bc
commit f0fc1368cf
1 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/quakefs.c
View file

@ -570,7 +570,6 @@ _COM_FOpenFile (char *filename, QFile **gzfile, char *foundname, int zip)
for (search = com_searchpaths; search; search = search->next) {
// is the element a pak file?
if (search->pack) {
#if 1
packfile_t *packfile;
packfile = (packfile_t*)Hash_Find (search->pack->file_hash,
@ -591,37 +590,6 @@ _COM_FOpenFile (char *filename, QFile **gzfile, char *foundname, int zip)
file_from_pak = 1;
return com_filesize;
}
#else
// look through all the pak file elements
int i;
pack_t *pak;
pak = search->pack;
for (i = 0; i < pak->numfiles; i++) {
char *fn = 0;
#ifdef HAVE_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!
Con_DPrintf ("PackFile: %s : %s\n", pak->filename, fn);
// open a new file on the pakfile
strncpy (foundname, fn, MAX_OSPATH);
*gzfile =
COM_OpenRead (pak->filename, pak->files[i].filepos,
pak->files[i].filelen, zip);
file_from_pak = 1;
return com_filesize;
}
}
#endif
} else {
// check a file in the directory tree
snprintf (netpath, sizeof (netpath), "%s/%s", search->filename,