X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=fs.h;h=5977f8c6087a2e968bf6c5db4ef9c2f8db01079e;hb=0b5e8b49f3ed65b746481dc175d67daf0c48a830;hp=aefa5b59b8b86261aa111e3588001720dbbb4e97;hpb=0a05c446ba26bd5897645a37ceec8646c5bc93eb;p=xonotic%2Fdarkplaces.git

diff --git a/fs.h b/fs.h
index aefa5b59..5977f8c6 100644
--- a/fs.h
+++ b/fs.h
@@ -25,19 +25,16 @@
 #ifndef FS_H
 #define FS_H
 
+#include <stddef.h>
+#include <stdarg.h>
+#include "qtypes.h"
+#include "qdefs.h"
+#include "zone.h"
 
 // ------ 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 ------ //
 
@@ -50,6 +47,14 @@ 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 ------ //