[quake3-commits] r2246 - trunk/code/qcommon

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-05-07 18:26:03 -0400 (Mon, 07 May 2012)
New Revision: 2246

Modified:
   trunk/code/qcommon/files.c
   trunk/code/qcommon/qcommon.h
Log:
#5462 - do not require clients to have a matching qagame.qvm (adapted from OpenArena)

Modified: trunk/code/qcommon/files.c
===================================================================
--- trunk/code/qcommon/files.c	2012-05-04 15:59:52 UTC (rev 2245)
+++ trunk/code/qcommon/files.c	2012-05-07 22:26:03 UTC (rev 2246)
@@ -1222,14 +1222,13 @@
 						   !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, "qagame.qvm"))
-						pak->referenced |= FS_QAGAME_REF;
 					if(strstr(filename, "cgame.qvm"))
 						pak->referenced |= FS_CGAME_REF;
 					if(strstr(filename, "ui.qvm"))
@@ -3439,31 +3438,6 @@
 
 /*
 =====================
-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
 
 Returns a space separated string containing the checksums of all loaded pk3 files.

Modified: trunk/code/qcommon/qcommon.h
===================================================================
--- trunk/code/qcommon/qcommon.h	2012-05-04 15:59:52 UTC (rev 2245)
+++ trunk/code/qcommon/qcommon.h	2012-05-07 22:26:03 UTC (rev 2246)
@@ -591,7 +591,6 @@
 #define FS_GENERAL_REF	0x01
 #define FS_UI_REF		0x02
 #define FS_CGAME_REF	0x04
-#define FS_QAGAME_REF	0x08
 // number of id paks that will never be autodownloaded from baseq3/missionpack
 #define NUM_ID_PAKS		9
 #define NUM_TA_PAKS		4
@@ -700,9 +699,6 @@
 
 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 );