yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-16 17:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix special case in filesystem when game is reset to baseq2, #969

Browse source 
When running a mod/addon and then switching back to baseq2,
FS_BuildGameSpecificSearchPath() is called and sets fs_gamedir
(amongst other things). Unfortunately it used fs_baseSearchPaths->path
to set it, and in the -portable case, the top base search path is
pak2.pak, i.e. not a normal directory, so fs_baseSearchPaths->path is ""
and fs_gamedir is set to "" => later Sys_Mkdir(fs_gamedir) fails.

Now fs_gamedir is set to the correct directory, based on fs_rawPath
This commit is contained in:
Daniel Gibson 2023-02-04 17:32:04 +01:00
parent 2e939b10e9
commit d3f748c03a
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/common/filesystem.c
View file

@ -1006,6 +1006,14 @@ FS_Path_f(void)
Com_Printf("\n");
Com_Printf("Raw search paths:\n");
for (fsRawPath_t* raw = fs_rawPath; raw != NULL; raw = raw->next)
{
Com_Printf("%s\n", raw->path);
}
Com_Printf("\n");
for (i = 0, handle = fs_handles; i < MAX_HANDLES; i++, handle++)
{
if ((handle->file != NULL) || (handle->zip != NULL))
@ -1865,7 +1873,7 @@ FS_BuildGameSpecificSearchPath(char *dir)
// We may not use the va() function from shared.c
// since it's buffersize is 1024 while most OS have
// a maximum path size of 4096...
char path[MAX_OSPATH];
char path[MAX_OSPATH] = {0};
int i;
fsRawPath_t *search;
@ -1918,7 +1926,8 @@ FS_BuildGameSpecificSearchPath(char *dir)
// fs_gamedir must be reset to the last
// dir of the generic search path.
Q_strlcpy(fs_gamedir, fs_baseSearchPaths->path, sizeof(fs_gamedir));
Com_sprintf(path, sizeof(path), "%s/%s", fs_rawPath->path, BASEDIRNAME);
Q_strlcpy(fs_gamedir, path, sizeof(fs_gamedir));
} else {
Cvar_FullSet("gamedir", dir, CVAR_SERVERINFO | CVAR_NOSET);
search = fs_rawPath;