NudgeOutOfSolid: fix moving entities out of the world in complex cases

[xonotic/darkplaces.git] / fs.h

diff --git a/fs.h b/fs.h
index 755e5c5046b5722f03c7249c91cf9e9436758824..60658027810a4cbbaf1af5062c6607d7af39a8b6 100644 (file)
--- a/fs.h
+++ b/fs.h
@@ -34,19 +34,11 @@
 // ------ Types ------ //
 
 typedef struct qfile_s qfile_t;
-
-#ifdef WIN32
-//typedef long fs_offset_t; // 32bit
-typedef __int64 fs_offset_t; ///< 64bit (lots of warnings, and read/write still don't take 64bit on win64)
-#else
-typedef long long fs_offset_t;
-#endif
-
-
+typedef int64_t fs_offset_t;
 
 // ------ Variables ------ //
 
-extern char fs_gamedir [MAX_OSPATH];
+extern char fs_gamedir [MAX_OSPATH]; ///< Files will be saved in this gamedir.
 extern char fs_basedir [MAX_OSPATH];
 extern char fs_userdir [MAX_OSPATH];
 
@@ -55,13 +47,21 @@ extern char fs_userdir [MAX_OSPATH];
 extern int fs_numgamedirs;
 extern char fs_gamedirs[MAX_GAMEDIRS][MAX_QPATH];
 
+typedef struct vfs_s
+{
+       char gamedir[MAX_OSPATH];
+       char basedir[MAX_OSPATH];
+       char userdir[MAX_OSPATH];
+       int numgamedirs;
+       char gamedirs[MAX_GAMEDIRS][MAX_QPATH];
+} vfs_t;
 
 // ------ Main functions ------ //
 
 // IMPORTANT: the file path is automatically prefixed by the current game directory for
 // each file created by FS_WriteFile, or opened in "write" or "append" mode by FS_OpenRealFile
 
-qbool FS_AddPack(const char *pakfile, qbool *already_loaded, qbool keep_plain_dirs); // already_loaded may be NULL if caller does not care
+qbool FS_AddPack(const char *pakfile, qbool *already_loaded, qbool keep_plain_dirs, qbool dlcache); // already_loaded may be NULL if caller does not care
 const char *FS_WhichPack(const char *filename);
 void FS_CreatePath (char *path);
 int FS_SysOpenFD(const char *filepath, const char *mode, qbool nonblocking); // uses absolute path
@@ -85,6 +85,7 @@ void FS_Purge (qfile_t* file);
 const char *FS_FileWithoutPath (const char *in);
 const char *FS_FileExtension (const char *in);
 int FS_CheckNastyPath (const char *path, qbool isgamedir);
+void FS_SanitizePath (char *path);
 
 extern const char *const fs_checkgamedir_missing; // "(missing)"
 const char *FS_CheckGameDir(const char *gamedir); // returns NULL if nasty, fs_checkgamedir_missing (exact pointer) if missing
@@ -101,6 +102,7 @@ extern int fs_all_gamedirs_count;
 qbool FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qbool complain, qbool failmissing);
 qbool FS_IsRegisteredQuakePack(const char *name);
 int FS_CRCFile(const char *filename, size_t *filesizepointer);
+void FS_UnloadPacks_dlcache(void);
 void FS_Rescan(void);
 
 typedef struct fssearch_s
@@ -129,11 +131,17 @@ void FS_DefaultExtension (char *path, const char *extension, size_t size_path);
 #define FS_FILETYPE_NONE 0
 #define FS_FILETYPE_FILE 1
 #define FS_FILETYPE_DIRECTORY 2
-int FS_FileType (const char *filename);                // the file can be into a package
-int FS_SysFileType (const char *filename);             // only look for files outside of packages
-
-qbool FS_FileExists (const char *filename);            // the file can be into a package
-qbool FS_SysFileExists (const char *filename); // only look for files outside of packages
+/// Look for a file in the packages and in the filesystem
+int FS_FileType (const char *filename);
+/// Look for a file in the filesystem only
+int FS_SysFileType (const char *filename);
+
+/// Look for a file in the packages and in the filesystem
+/// Returns its canonical name (same case as used in the pack) if found, else NULL.
+/// If the file is found outside a pak, this will be the same pointer as passed in.
+const char *FS_FileExists (const char *filename);
+/// Look for a file in the filesystem only
+qbool FS_SysFileExists (const char *filename);
 
 unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflated_size, int level, mempool_t *mempool);
 unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflated_size, mempool_t *mempool);