mirror of
https://github.com/YGGverse/xash3d-fwgs.git
synced 2025-01-17 18:40:02 +00:00
filesystem: fixes for GCC 3
This commit is contained in:
parent
10ad1c3b38
commit
0d449370e0
@ -476,10 +476,10 @@ public:
|
|||||||
int ResumeResourcePreloading() override { return 0; }
|
int ResumeResourcePreloading() override { return 0; }
|
||||||
bool IsAppReadyForOfflinePlay(int) override { return true; }
|
bool IsAppReadyForOfflinePlay(int) override { return true; }
|
||||||
bool IsFileImmediatelyAvailable(const char *) override { return true; }
|
bool IsFileImmediatelyAvailable(const char *) override { return true; }
|
||||||
bool GetWaitForResourcesProgress(WaitForResourcesHandle_t, float *progress, bool *override) override
|
bool GetWaitForResourcesProgress(WaitForResourcesHandle_t, float *pProgress, bool *pOverride) override
|
||||||
{
|
{
|
||||||
if( progress ) *progress = 0;
|
if( pProgress ) *pProgress = 0;
|
||||||
if( override ) *override = true;
|
if( pOverride ) *pOverride = true;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} g_VFileSystem009;
|
} g_VFileSystem009;
|
||||||
|
@ -28,7 +28,6 @@ typedef struct zip_s zip_t;
|
|||||||
typedef struct pack_s pack_t;
|
typedef struct pack_s pack_t;
|
||||||
typedef struct wfile_s wfile_t;
|
typedef struct wfile_s wfile_t;
|
||||||
|
|
||||||
|
|
||||||
#define FILE_BUFF_SIZE (2048)
|
#define FILE_BUFF_SIZE (2048)
|
||||||
|
|
||||||
struct file_s
|
struct file_s
|
||||||
|
@ -63,14 +63,14 @@ typedef struct
|
|||||||
#define PAK_LOAD_NO_FILES 5
|
#define PAK_LOAD_NO_FILES 5
|
||||||
#define PAK_LOAD_CORRUPTED 6
|
#define PAK_LOAD_CORRUPTED 6
|
||||||
|
|
||||||
typedef struct pack_s
|
struct pack_s
|
||||||
{
|
{
|
||||||
string filename;
|
string filename;
|
||||||
int handle;
|
int handle;
|
||||||
int numfiles;
|
int numfiles;
|
||||||
time_t filetime; // common for all packed files
|
time_t filetime; // common for all packed files
|
||||||
dpackfile_t *files;
|
dpackfile_t *files;
|
||||||
} pack_t;
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
====================
|
====================
|
||||||
|
@ -69,7 +69,7 @@ typedef struct
|
|||||||
char name[WAD3_NAMELEN]; // must be null terminated
|
char name[WAD3_NAMELEN]; // must be null terminated
|
||||||
} dlumpinfo_t;
|
} dlumpinfo_t;
|
||||||
|
|
||||||
typedef struct wfile_s
|
struct wfile_s
|
||||||
{
|
{
|
||||||
string filename;
|
string filename;
|
||||||
int infotableofs;
|
int infotableofs;
|
||||||
@ -78,7 +78,7 @@ typedef struct wfile_s
|
|||||||
file_t *handle;
|
file_t *handle;
|
||||||
dlumpinfo_t *lumps;
|
dlumpinfo_t *lumps;
|
||||||
time_t filetime;
|
time_t filetime;
|
||||||
} wfile_t;
|
};
|
||||||
|
|
||||||
// WAD errors
|
// WAD errors
|
||||||
#define WAD_LOAD_OK 0
|
#define WAD_LOAD_OK 0
|
||||||
|
@ -118,14 +118,14 @@ typedef struct zipfile_s
|
|||||||
unsigned short flags;
|
unsigned short flags;
|
||||||
} zipfile_t;
|
} zipfile_t;
|
||||||
|
|
||||||
typedef struct zip_s
|
struct zip_s
|
||||||
{
|
{
|
||||||
string filename;
|
string filename;
|
||||||
int handle;
|
int handle;
|
||||||
int numfiles;
|
int numfiles;
|
||||||
time_t filetime;
|
time_t filetime;
|
||||||
zipfile_t *files;
|
zipfile_t *files;
|
||||||
} zip_t;
|
};
|
||||||
|
|
||||||
#ifdef XASH_REDUCE_FD
|
#ifdef XASH_REDUCE_FD
|
||||||
static void FS_EnsureOpenZip( zip_t *zip )
|
static void FS_EnsureOpenZip( zip_t *zip )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user