eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Fix downloads-are-going-to-qw-gamedir bug.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5510 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-08-11 13:54:26 +00:00
parent c8b040b360
commit c0b383886e
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
engine/common/fs.c
View file

@ -821,8 +821,9 @@ static int QDECL COM_Dir_List(const char *name, qofs_t size, time_t mtime, void
|| !Q_strcasecmp(link, "vmt") || !Q_strcasecmp(link, "vmt")
) )
Q_snprintfz(link, sizeof(link), "\\tip\\Open in Text Editor\\edit\\%s", name); Q_snprintfz(link, sizeof(link), "\\tip\\Open in Text Editor\\edit\\%s", name);
else if (!Q_strcasecmp(link, "tga") || !Q_strcasecmp(link, "png") || !Q_strcasecmp(link, "jpg") || !Q_strcasecmp(link, "jpeg") || !Q_strcasecmp(link, "lmp") || !Q_strcasecmp(link, "ico") || else if (!Q_strcasecmp(link, "tga") || !Q_strcasecmp(link, "png") || !Q_strcasecmp(link, "jpg") || !Q_strcasecmp(link, "jpeg")|| !Q_strcasecmp(link, "lmp") || !Q_strcasecmp(link, "ico") ||
!Q_strcasecmp(link, "pcx") || !Q_strcasecmp(link, "bmp") || !Q_strcasecmp(link, "dds") || !Q_strcasecmp(link, "ktx") || !Q_strcasecmp(link, "vtf") || !Q_strcasecmp(link, "psd") || !Q_strcasecmp(link, "pcx") || !Q_strcasecmp(link, "bmp") || !Q_strcasecmp(link, "dds") || !Q_strcasecmp(link, "ktx") || !Q_strcasecmp(link, "vtf") || !Q_strcasecmp(link, "psd") ||
!Q_strcasecmp(link, "astc")|| !Q_strcasecmp(link, "htga")||
!Q_strcasecmp(link, "pbm") || !Q_strcasecmp(link, "ppm") || !Q_strcasecmp(link, "pgm") || !Q_strcasecmp(link, "pam") || !Q_strcasecmp(link, "pfm") || !Q_strcasecmp(link, "hdr") ) !Q_strcasecmp(link, "pbm") || !Q_strcasecmp(link, "ppm") || !Q_strcasecmp(link, "pgm") || !Q_strcasecmp(link, "pam") || !Q_strcasecmp(link, "pfm") || !Q_strcasecmp(link, "hdr") )
{ {
//FIXME: image replacements are getting in the way here. //FIXME: image replacements are getting in the way here.
@ -1731,9 +1732,10 @@ static vfsfile_t *VFS_Filter(const char *filename, vfsfile_t *handle)
qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen) qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen)
{ {
flocation_t loc; flocation_t loc;
char *last;
int i; int i;
char cleanname[MAX_QPATH]; char cleanname[MAX_QPATH];
char *last;
qboolean wasbase; //to handle out-of-order base/game dirs.
if (relativeto == FS_SYSTEM) if (relativeto == FS_SYSTEM)
{ {
@ -1794,12 +1796,16 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
case FS_BASEGAMEONLY: // fte/ case FS_BASEGAMEONLY: // fte/
last = NULL; last = NULL;
wasbase = true;
for (i = 0; i < countof(fs_manifest->gamepath); i++) for (i = 0; i < countof(fs_manifest->gamepath); i++)
{ {
if (fs_manifest && fs_manifest->gamepath[i].base && fs_manifest->gamepath[i].path) if (fs_manifest && fs_manifest->gamepath[i].base && fs_manifest->gamepath[i].path)
{ {
if (!strcmp(fs_manifest->gamepath[i].path, "*")) if (!strcmp(fs_manifest->gamepath[i].path, "*"))
continue; continue;
if (fs_manifest->gamepath[i].base && !wasbase)
continue;
wasbase = fs_manifest->gamepath[i].base;
last = fs_manifest->gamepath[i].path; last = fs_manifest->gamepath[i].path;
if (*last == '*') if (*last == '*')
last++; last++;
@ -1814,12 +1820,16 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
break; break;
case FS_PUBGAMEONLY: // $gamedir/ or qw/ but not fte/ case FS_PUBGAMEONLY: // $gamedir/ or qw/ but not fte/
last = NULL; last = NULL;
wasbase = true;
for (i = 0; i < countof(fs_manifest->gamepath); i++) for (i = 0; i < countof(fs_manifest->gamepath); i++)
{ {
if (fs_manifest && fs_manifest->gamepath[i].path) if (fs_manifest && fs_manifest->gamepath[i].path)
{ {
if (*fs_manifest->gamepath[i].path == '*') if (*fs_manifest->gamepath[i].path == '*')
continue; continue;
if (fs_manifest->gamepath[i].base && !wasbase)
continue;
wasbase = fs_manifest->gamepath[i].base;
last = fs_manifest->gamepath[i].path; last = fs_manifest->gamepath[i].path;
} }
} }
@ -1838,6 +1848,7 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
{ {
if (*fs_manifest->gamepath[i].path == '*') if (*fs_manifest->gamepath[i].path == '*')
continue; continue;
wasbase = fs_manifest->gamepath[i].base;
last = fs_manifest->gamepath[i].path; last = fs_manifest->gamepath[i].path;
} }
} }