#5462 - do not require clients to have a matching qagame.qvm (adapted from OpenArena)

This commit is contained in:
Zack Middleton 2012-05-07 22:26:03 +00:00
parent d2b035eb73
commit c211114cb0
2 changed files with 1 additions and 31 deletions

View file

@ -1222,14 +1222,13 @@ long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_
!FS_IsExt(filename, ".bot", len) && !FS_IsExt(filename, ".bot", len) &&
!FS_IsExt(filename, ".arena", len) && !FS_IsExt(filename, ".arena", len) &&
!FS_IsExt(filename, ".menu", len) && !FS_IsExt(filename, ".menu", len) &&
Q_stricmp(filename, "qagame.qvm") != 0 &&
!strstr(filename, "levelshots")) !strstr(filename, "levelshots"))
{ {
pak->referenced |= FS_GENERAL_REF; pak->referenced |= FS_GENERAL_REF;
} }
} }
if(strstr(filename, "qagame.qvm"))
pak->referenced |= FS_QAGAME_REF;
if(strstr(filename, "cgame.qvm")) if(strstr(filename, "cgame.qvm"))
pak->referenced |= FS_CGAME_REF; pak->referenced |= FS_CGAME_REF;
if(strstr(filename, "ui.qvm")) if(strstr(filename, "ui.qvm"))
@ -3437,31 +3436,6 @@ static void FS_CheckPak0( void )
} }
#endif #endif
/*
=====================
FS_GamePureChecksum
Returns the checksum of the pk3 from which the server loaded the qagame.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 FS_LoadedPakChecksums

View file

@ -591,7 +591,6 @@ issues.
#define FS_GENERAL_REF 0x01 #define FS_GENERAL_REF 0x01
#define FS_UI_REF 0x02 #define FS_UI_REF 0x02
#define FS_CGAME_REF 0x04 #define FS_CGAME_REF 0x04
#define FS_QAGAME_REF 0x08
// number of id paks that will never be autodownloaded from baseq3/missionpack // number of id paks that will never be autodownloaded from baseq3/missionpack
#define NUM_ID_PAKS 9 #define NUM_ID_PAKS 9
#define NUM_TA_PAKS 4 #define NUM_TA_PAKS 4
@ -700,9 +699,6 @@ int FS_Seek( fileHandle_t f, long offset, int origin );
qboolean FS_FilenameCompare( const char *s1, const char *s2 ); 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_LoadedPakNames( void );
const char *FS_LoadedPakChecksums( void ); const char *FS_LoadedPakChecksums( void );
const char *FS_LoadedPakPureChecksums( void ); const char *FS_LoadedPakPureChecksums( void );