dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-27 06:32:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove remaining binary pak FileSystem code

Browse source
This commit is contained in:
dhewg 2012-07-04 00:12:09 +02:00
parent 0b08240e02
commit b5fd5b0c9b
1 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
neo/framework/FileSystem.cpp
View file

@ -262,12 +262,6 @@ typedef struct fileInPack_s {
struct fileInPack_s * next; // next file in the hash struct fileInPack_s * next; // next file in the hash
} fileInPack_t; } fileInPack_t;
typedef enum {
BINARY_UNKNOWN = 0,
BINARY_YES,
BINARY_NO
} binaryStatus_t;
typedef enum { typedef enum {
PURE_UNKNOWN = 0, // need to run the pak through GetPackStatus PURE_UNKNOWN = 0, // need to run the pak through GetPackStatus
PURE_NEUTRAL, // neutral regarding pureness. gets in the pure list if referenced PURE_NEUTRAL, // neutral regarding pureness. gets in the pure list if referenced
@ -287,7 +281,6 @@ typedef struct {
int numfiles; int numfiles;
int length; int length;
bool referenced; bool referenced;
binaryStatus_t binary;
bool addon; // this is an addon pack - addon_search tells if it's 'active' bool addon; // this is an addon pack - addon_search tells if it's 'active'
bool addon_search; // is in the search list bool addon_search; // is in the search list
addonInfo_t *addon_info; addonInfo_t *addon_info;
@ -312,7 +305,6 @@ typedef struct searchpath_s {
#define FSFLAG_SEARCH_DIRS ( 1 << 0 ) #define FSFLAG_SEARCH_DIRS ( 1 << 0 )
#define FSFLAG_SEARCH_PAKS ( 1 << 1 ) #define FSFLAG_SEARCH_PAKS ( 1 << 1 )
#define FSFLAG_PURE_NOREF ( 1 << 2 ) #define FSFLAG_PURE_NOREF ( 1 << 2 )
#define FSFLAG_BINARY_ONLY ( 1 << 3 )
#define FSFLAG_SEARCH_ADDONS ( 1 << 4 ) #define FSFLAG_SEARCH_ADDONS ( 1 << 4 )
// 3 search path (fs_savepath fs_basepath fs_cdpath) // 3 search path (fs_savepath fs_basepath fs_cdpath)
@ -1312,7 +1304,6 @@ pack_t *idFileSystemLocal::LoadZipFile( const char *zipfile ) {
pack->numfiles = gi.number_entry; pack->numfiles = gi.number_entry;
pack->buildBuffer = buildBuffer; pack->buildBuffer = buildBuffer;
pack->referenced = false; pack->referenced = false;
pack->binary = BINARY_UNKNOWN;
pack->addon = false; pack->addon = false;
pack->addon_search = false; pack->addon_search = false;
pack->addon_info = NULL; pack->addon_info = NULL;
@ -1967,7 +1958,6 @@ idFileSystemLocal::Path_f
*/ */
void idFileSystemLocal::Path_f( const idCmdArgs &args ) { void idFileSystemLocal::Path_f( const idCmdArgs &args ) {
searchpath_t *sp; searchpath_t *sp;
int i;
idStr status; idStr status;
common->Printf( "Current search path:\n" ); common->Printf( "Current search path:\n" );
@ -3106,26 +3096,6 @@ idFile *idFileSystemLocal::OpenFileReadFlags( const char *relativePath, int sear
// look through all the pak file elements // look through all the pak file elements
pak = search->pack; pak = search->pack;
if ( searchFlags & FSFLAG_BINARY_ONLY ) {
// make sure this pak is tagged as a binary file
if ( pak->binary == BINARY_UNKNOWN ) {
int confHash;
fileInPack_t *pakFile;
confHash = HashFileName( BINARY_CONFIG );
pak->binary = BINARY_NO;
for ( pakFile = search->pack->hashTable[confHash]; pakFile; pakFile = pakFile->next ) {
if ( !FilenameCompare( pakFile->name, BINARY_CONFIG ) ) {
pak->binary = BINARY_YES;
break;
}
}
}
if ( pak->binary == BINARY_NO ) {
continue; // not a binary pak, skip
}
}
for ( pakFile = pak->hashTable[hash]; pakFile; pakFile = pakFile->next ) { for ( pakFile = pak->hashTable[hash]; pakFile; pakFile = pakFile->next ) {
// case and separator insensitive comparisons // case and separator insensitive comparisons
if ( !FilenameCompare( pakFile->name, relativePath ) ) { if ( !FilenameCompare( pakFile->name, relativePath ) ) {