yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-22 09:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

filesystem: rearange pak load code

Browse source
This commit is contained in:
Denis Pauk 2024-03-31 16:43:14 +03:00
parent 57e68967cb
commit 6b6da54054
1 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/common/filesystem.c
View file

@ -940,52 +940,18 @@ FS_LoadDAT(const char *packPath)
return pack;
}
/*
* Takes an explicit (not game tree related) path to a pak file.
*
* Loads the header and directory, adding the files at the beginning of the
* list so they override previous pack files.
*/
static fsPack_t *
FS_LoadPAK(const char *packPath)
FS_LoadPAKQ2(dpackheader_t *header, FILE *handle, const char *packPath)
{
int i; /* Loop counter. */
int numFiles; /* Number of files in PAK. */
FILE *handle; /* File handle. */
fsPackFile_t *files; /* List of files in PAK. */
fsPack_t *pack; /* PAK file. */
dpackheader_t header; /* PAK file header. */
dpackfile_t *info = NULL; /* PAK info. */
handle = Q_fopen(packPath, "rb");
numFiles = header->dirlen / sizeof(dpackfile_t);
if (handle == NULL)
{
return NULL;
}
fread(&header, 1, sizeof(dpackheader_t), handle);
if (LittleLong(header.ident) != IDPAKHEADER)
{
fclose(handle);
Com_Error(ERR_FATAL, "%s: '%s' is not a pack file", __func__, packPath);
}
header.dirofs = LittleLong(header.dirofs);
header.dirlen = LittleLong(header.dirlen);
if ((header.dirlen % sizeof(dpackfile_t)) != 0)
{
fclose(handle);
Com_Printf("WARNING: '%s' looks as Daikatana pak. Skipped it!\n",
packPath);
return NULL;
}
numFiles = header.dirlen / sizeof(dpackfile_t);
if ((numFiles == 0) || (header.dirlen < 0) || (header.dirofs < 0))
if ((numFiles == 0) || (header->dirlen < 0) || (header->dirofs < 0))
{
fclose(handle);
Com_Error(ERR_FATAL, "%s: '%s' is too short.",
@ -998,17 +964,17 @@ FS_LoadPAK(const char *packPath)
__func__, packPath, numFiles, MAX_FILES_IN_PACK);
}
info = malloc(header.dirlen);
info = malloc(header->dirlen);
if (!info)
{
Com_Error(ERR_FATAL, "%s: '%s' is to big for read %d",
__func__, packPath, header.dirlen);
__func__, packPath, header->dirlen);
}
files = Z_Malloc(numFiles * sizeof(fsPackFile_t));
fseek(handle, header.dirofs, SEEK_SET);
fread(info, 1, header.dirlen, handle);
fseek(handle, header->dirofs, SEEK_SET);
fread(info, 1, header->dirlen, handle);
/* Parse the directory. */
for (i = 0; i < numFiles; i++)
@ -1032,6 +998,47 @@ FS_LoadPAK(const char *packPath)
return pack;
}
/*
* Takes an explicit (not game tree related) path to a pak file.
*
* Loads the header and directory, adding the files at the beginning of the
* list so they override previous pack files.
*/
static fsPack_t *
FS_LoadPAK(const char *packPath)
{
FILE *handle; /* File handle. */
dpackheader_t header; /* PAK file header. */
handle = Q_fopen(packPath, "rb");
if (handle == NULL)
{
return NULL;
}
fread(&header, 1, sizeof(dpackheader_t), handle);
if (LittleLong(header.ident) != IDPAKHEADER)
{
fclose(handle);
Com_Error(ERR_FATAL, "%s: '%s' is not a pack file", __func__, packPath);
}
header.dirofs = LittleLong(header.dirofs);
header.dirlen = LittleLong(header.dirlen);
if ((header.dirlen % sizeof(dpackfile_t)) == 0)
{
return FS_LoadPAKQ2(&header, handle, packPath);
}
fclose(handle);
Com_Printf("WARNING: '%s' looks as Daikatana pak. Skipped it!\n",
packPath);
return NULL;
}
/*
* Takes an explicit (not game tree related) path to a pack file.
*