Fix up filesystem plugins slightly. Remove engine references to VPK support.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6100 fc73d0e0-1445-4013-8a0c-d673dee63da5

CMakeLists.txt

@@ -528,7 +528,6 @@ SET(FTE_COMMON_FILES
 	engine/common/fs_stdio.c
 	engine/common/fs_xz.c
 	engine/common/fs_zip.c
-	engine/common/fs_vpk.c
 	engine/common/gl_q2bsp.c
 	engine/common/huff.c
 	engine/common/log.c

engine/Makefile

@@ -918,7 +918,6 @@ COMMON_OBJS = \
 	fs_stdio.o		\
 	fs_pak.o		\
 	fs_zip.o		\
-	fs_vpk.o		\
 	fs_dzip.o		\
 	fs_xz.o		\
 	m_download.o	\

engine/common/config_freecs.h

@@ -167,7 +167,6 @@
 //#define IPLOG
 //#define MVD_RECORDING
 //#define PACKAGEMANAGER
-//#define PACKAGE_VPK
 //#define SAVEDGAMES
 //#define AVAIL_BOTLIB
 //#define AVAIL_BZLIB

engine/common/config_fteqw.h

@@ -54,7 +54,6 @@
 #define PACKAGE_PK3				//aka zips. we support utf8,zip64,spans,weakcrypto,(deflate),(bzip2),symlinks. we do not support strongcrypto nor any of the other compression schemes.
 #define PACKAGE_Q1PAK			//also q2
 //#define PACKAGE_DOOMWAD		//doom wad support (generates various file names, and adds support for doom's audio, sprites, etc)
-#define PACKAGE_VPK				//HalfLife2's packages
 #define AVAIL_XZDEC				//.xz decompression
 #define AVAIL_GZDEC				//.gz decompression
 #define AVAIL_ZLIB				//whether pk3s can be compressed or not.

engine/common/config_minimal.h

@@ -56,7 +56,6 @@
 #define PACKAGE_PK3				//aka zips. we support utf8,zip64,spans,weakcrypto,(deflate),(bzip2),symlinks. we do not support strongcrypto nor any of the other compression schemes.
 #define PACKAGE_Q1PAK			//also q2
 //#define PACKAGE_DOOMWAD		//doom wad support (generates various file names, and adds support for doom's audio, sprites, etc)
-//#define PACKAGE_VPK			//hl2 packages
 //#define AVAIL_XZDEC			//.xz decompression
 //#define AVAIL_GZDEC			//.gz decompression
 #define AVAIL_ZLIB				//whether pk3s can be compressed or not.

engine/common/config_nocompat.h

@@ -54,7 +54,6 @@
 #define PACKAGE_PK3				//aka zips. we support utf8,zip64,spans,weakcrypto,(deflate),(bzip2),symlinks. we do not support strongcrypto nor any of the other compression schemes.
 //#define PACKAGE_Q1PAK			//also q2
 //#define PACKAGE_DOOMWAD		//doom wad support (generates various file names, and adds support for doom's audio, sprites, etc)
-//#define PACKAGE_VPK			//hl2 packages
 //#define AVAIL_XZDEC			//.xz decompression
 #define AVAIL_GZDEC				//.gz decompression
 #define AVAIL_ZLIB				//whether pk3s can be compressed or not.

engine/common/config_wastes.h

@@ -101,7 +101,6 @@
 #undef USE_INTERNAL_BULLET
 #undef USE_INTERNAL_ODE
 #undef PACKAGE_DOOMWAD
-#undef PACKAGE_VPK
 #undef DOOMWADS
 #undef MAP_PROC
 #undef Q2BSPS

engine/common/fs.c

@@ -105,6 +105,7 @@ void FS_UnRegisterFileSystemModule(void *module)
 		{
 			if (searchpathformats[i].module == module)
 			{
+				searchpathformats[i].extension = NULL;
 				searchpathformats[i].OpenNew = NULL;
 				searchpathformats[i].module = NULL;
 				found = true;
@@ -7292,9 +7293,6 @@ void FS_RegisterDefaultFileSystems(void)
 	FS_RegisterFileSystemType(NULL, "dll", FSZIP_LoadArchive, false);	//for plugin metas / self-extracting zips.
 	FS_RegisterFileSystemType(NULL, "so", FSZIP_LoadArchive, false);	//for plugin metas / self-extracting zips.
 #endif
-#ifdef PACKAGE_VPK
-	FS_RegisterFileSystemType(NULL, "vpk", FSVPK_LoadArchive, true);
-#endif
 #ifdef PACKAGE_DOOMWAD
 	FS_RegisterFileSystemType(NULL, "wad", FSDWD_LoadArchive, true);
 #endif

engine/common/fs.h

@@ -60,7 +60,6 @@ struct searchpathfuncs_s
 //warning: the handle is known to be a string pointer to the dir name
 extern searchpathfuncs_t *(QDECL VFSOS_OpenPath)	(vfsfile_t *file, searchpathfuncs_t *parent, const char *filename, const char *desc, const char *prefix);
 extern searchpathfuncs_t *(QDECL FSZIP_LoadArchive) (vfsfile_t *file, searchpathfuncs_t *parent, const char *filename, const char *desc, const char *prefix);
-extern searchpathfuncs_t *(QDECL FSVPK_LoadArchive) (vfsfile_t *file, searchpathfuncs_t *parent, const char *filename, const char *desc, const char *prefix);
 extern searchpathfuncs_t *(QDECL FSPAK_LoadArchive) (vfsfile_t *file, searchpathfuncs_t *parent, const char *filename, const char *desc, const char *prefix);
 extern searchpathfuncs_t *(QDECL FSDWD_LoadArchive) (vfsfile_t *file, searchpathfuncs_t *parent, const char *filename, const char *desc, const char *prefix);
 extern searchpathfuncs_t *(QDECL FSDZ_LoadArchive)	(vfsfile_t *file, searchpathfuncs_t *parent, const char *filename, const char *desc, const char *prefix);

engine/common/plugin.c

@@ -1858,6 +1858,10 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 			FS_OpenVFS,
 			FS_NativePath,
 			COM_EnumerateFiles,
+
+			wildcmp,
+			COM_CleanUpPath,
+			Com_BlockChecksum,
 		};
 		if (structsize == sizeof(funcs))
 			return &funcs;

plugins/plugin.h

@@ -330,6 +330,11 @@ typedef struct	//for plugins that need to read/write files...
 	F(vfsfile_t*,OpenVFS,		(const char *filename, const char *mode, enum fs_relative relativeto));		//opens a direct vfs file, without any access checks, and so can be used in threaded plugins
 	F(qboolean,	NativePath,		(const char *name, enum fs_relative relativeto, char *out, int outlen));
 	F(void,		EnumerateFiles,	(const char *match, int (QDECL *callback)(const char *fname, qofs_t fsize, time_t mtime, void *ctx, struct searchpathfuncs_s *package), void *ctx));
+
+	//helpers
+	F(int,		WildCmp,		(const char *wild, const char *string));
+	F(void,		CleanUpPath,	(char *str));
+	F(unsigned int,BlockChecksum,(const void *buffer, int length));	//mostly for pack hashes.
 #define plugfsfuncs_name "Filesystem"
 } plugfsfuncs_t;