diff options
author | Zack Middleton <zturtleman@gmail.com> | 2012-05-07 22:26:03 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2013-01-12 20:28:43 +0000 |
commit | 26b1648ac4291a04abaab7389a2b2dd640e7b317 (patch) | |
tree | fd01301da939da95711b7603781fc44d0ccc73a6 /src | |
parent | 3b12b8a3ad4a7bcba2258076e61db9967b648bbc (diff) |
#5462 - do not require clients to have a matching qagame.qvm (adapted from OpenArena)
Diffstat (limited to 'src')
-rw-r--r-- | src/qcommon/files.c | 28 | ||||
-rw-r--r-- | src/qcommon/qcommon.h | 4 |
2 files changed, 1 insertions, 31 deletions
diff --git a/src/qcommon/files.c b/src/qcommon/files.c index 6948d953..b8a70a22 100644 --- a/src/qcommon/files.c +++ b/src/qcommon/files.c @@ -1184,14 +1184,13 @@ long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_ !FS_IsExt(filename, ".bot", len) && !FS_IsExt(filename, ".arena", len) && !FS_IsExt(filename, ".menu", len) && + Q_stricmp(filename, "qagame.qvm") != 0 && !strstr(filename, "levelshots")) { pak->referenced |= FS_GENERAL_REF; } } - if(strstr(filename, "game.qvm")) - pak->referenced |= FS_QAGAME_REF; if(strstr(filename, "cgame.qvm")) pak->referenced |= FS_CGAME_REF; if(strstr(filename, "ui.qvm")) @@ -3154,31 +3153,6 @@ static void FS_Startup( const char *gameName ) /* ===================== -FS_GamePureChecksum - -Returns the checksum of the pk3 from which the server loaded the game.qvm -===================== -*/ -const char *FS_GamePureChecksum( void ) { - static char info[MAX_STRING_TOKENS]; - searchpath_t *search; - - info[0] = 0; - - for ( search = fs_searchpaths ; search ; search = search->next ) { - // is the element a pak file? - if ( search->pack ) { - if (search->pack->referenced & FS_QAGAME_REF) { - Com_sprintf(info, sizeof(info), "%d", search->pack->checksum); - } - } - } - - return info; -} - -/* -===================== FS_LoadedPakChecksums Returns a space separated string containing the checksums of all loaded pk3 files. diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index 40fc58cb..70fb6397 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -573,7 +573,6 @@ issues. #define FS_GENERAL_REF 0x01 #define FS_UI_REF 0x02 #define FS_CGAME_REF 0x04 -#define FS_QAGAME_REF 0x08 #define MAX_FILE_HANDLES 64 @@ -681,9 +680,6 @@ int FS_Seek( fileHandle_t f, long offset, int origin ); qboolean FS_FilenameCompare( const char *s1, const char *s2 ); -const char *FS_GamePureChecksum( void ); -// Returns the checksum of the pk3 from which the server loaded the qagame.qvm - const char *FS_LoadedPakNames( void ); const char *FS_LoadedPakChecksums( void ); const char *FS_LoadedPakPureChecksums( void ); |