dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-30 08:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove UpdateGamePakChecksums()

Browse source 
Not required anymore.
This commit is contained in:
dhewg 2012-07-03 23:17:44 +02:00
parent 72156cb1b4
commit a86cbb1bff
2 changed files with 0 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
neo/framework/FileSystem.cpp
View file

@ -359,7 +359,6 @@ public:
virtual void CreateOSPath( const char *OSPath ); virtual void CreateOSPath( const char *OSPath );
virtual bool FileIsInPAK( const char *relativePath ); virtual bool FileIsInPAK( const char *relativePath );
virtual void UpdatePureServerChecksums( void ); virtual void UpdatePureServerChecksums( void );
virtual bool UpdateGamePakChecksums( void );
virtual fsPureReply_t SetPureServerChecksums( const int pureChecksums[ MAX_PURE_PAKS ], int gamePakChecksum, int missingChecksums[ MAX_PURE_PAKS ], int *missingGamePakChecksum ); virtual fsPureReply_t SetPureServerChecksums( const int pureChecksums[ MAX_PURE_PAKS ], int gamePakChecksum, int missingChecksums[ MAX_PURE_PAKS ], int *missingGamePakChecksum );
virtual void GetPureServerChecksums( int checksums[ MAX_PURE_PAKS ], int OS, int *gamePakChecksum ); virtual void GetPureServerChecksums( int checksums[ MAX_PURE_PAKS ], int OS, int *gamePakChecksum );
virtual void SetRestartChecksums( const int pureChecksums[ MAX_PURE_PAKS ], int gamePakChecksum ); virtual void SetRestartChecksums( const int pureChecksums[ MAX_PURE_PAKS ], int gamePakChecksum );
@ -2447,71 +2446,6 @@ void idFileSystemLocal::UpdatePureServerChecksums( void ) {
} }
} }
/*
=====================
idFileSystemLocal::UpdateGamePakChecksums
=====================
*/
bool idFileSystemLocal::UpdateGamePakChecksums( void ) {
searchpath_t *search;
fileInPack_t *pakFile;
int confHash;
idFile *confFile;
char *buf;
idLexer *lexConf;
idToken token;
int id;
confHash = HashFileName( BINARY_CONFIG );
memset( gamePakForOS, 0, sizeof( gamePakForOS ) );
for ( search = searchPaths; search; search = search->next ) {
if ( !search->pack ) {
continue;
}
search->pack->binary = BINARY_NO;
for ( pakFile = search->pack->hashTable[confHash]; pakFile; pakFile = pakFile->next ) {
if ( !FilenameCompare( pakFile->name, BINARY_CONFIG ) ) {
search->pack->binary = BINARY_YES;
confFile = ReadFileFromZip( search->pack, pakFile, BINARY_CONFIG );
buf = new char[ confFile->Length() + 1 ];
confFile->Read( (void *)buf, confFile->Length() );
buf[ confFile->Length() ] = '\0';
lexConf = new idLexer( buf, confFile->Length(), confFile->GetFullPath() );
while ( lexConf->ReadToken( &token ) ) {
if ( token.IsNumeric() ) {
id = atoi( token );
if ( id < MAX_GAME_OS && !gamePakForOS[ id ] ) {
if ( fs_debug.GetBool() ) {
common->Printf( "Adding game pak checksum for OS %d: %s 0x%x\n", id, confFile->GetFullPath(), search->pack->checksum );
}
gamePakForOS[ id ] = search->pack->checksum;
}
}
}
CloseFile( confFile );
delete lexConf;
delete[] buf;
}
}
}
// some sanity checks on the game code references
// make sure that at least the local OS got a pure reference
if ( !gamePakForOS[ BUILD_OS_ID ] ) {
common->Warning( "No game code pak reference found for the local OS" );
return false;
}
if ( !cvarSystem->GetCVarBool( "net_serverAllowServerMod" ) &&
gamePakChecksum != gamePakForOS[ BUILD_OS_ID ] ) {
common->Warning( "The current game code doesn't match pak files (net_serverAllowServerMod is off)" );
return false;
}
return true;
}
/* /*
===================== =====================
idFileSystemLocal::GetPackForChecksum idFileSystemLocal::GetPackForChecksum

2
neo/framework/FileSystem.h
View file

@ -194,8 +194,6 @@ public:
// Returns a space separated string containing the checksums of all referenced pak files. // Returns a space separated string containing the checksums of all referenced pak files.
// will call SetPureServerChecksums internally to restrict itself // will call SetPureServerChecksums internally to restrict itself
virtual void UpdatePureServerChecksums( void ) = 0; virtual void UpdatePureServerChecksums( void ) = 0;
// setup the mapping of OS -> game pak checksum
virtual bool UpdateGamePakChecksums( void ) = 0;
// 0-terminated list of pak checksums // 0-terminated list of pak checksums
// if pureChecksums[ 0 ] == 0, all data sources will be allowed // if pureChecksums[ 0 ] == 0, all data sources will be allowed
// otherwise, only pak files that match one of the checksums will be checked for files // otherwise, only pak files that match one of the checksums will be checked for files