From f9ea81d7cf7be20ee03038847c44aaddaccdf9c5 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Sat, 11 Mar 2006 05:12:33 +0000 Subject: [PATCH] fix to FS_OpenVFS with skins git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2082 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/fs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/common/fs.c b/engine/common/fs.c index 2e7c8596..d699cdfd 100644 --- a/engine/common/fs.c +++ b/engine/common/fs.c @@ -1822,6 +1822,12 @@ vfsfile_t *FS_OpenVFS(char *filename, char *mode, int relativeto) else snprintf(fullname, sizeof(fullname), "%s%s/%s", com_quakedir, gamedirfile, filename); break; + case FS_SKINS: + if (*com_homedir) + snprintf(fullname, sizeof(fullname), "%s%s/skins/%s", com_homedir, gamedirfile, filename); + else + snprintf(fullname, sizeof(fullname), "%s%s/skins/%s", com_quakedir, gamedirfile, filename); + break; case FS_BASE: if (*com_homedir) { @@ -1843,7 +1849,7 @@ vfsfile_t *FS_OpenVFS(char *filename, char *mode, int relativeto) snprintf(fullname, sizeof(fullname), "%sfte/%s", com_quakedir, filename); return VFSOS_Open(fullname, mode); default: - Sys_Error("FS_CreatePath: Bad relative path"); + Sys_Error("FS_OpenVFS: Bad relative path (%i)", relativeto); break; } @@ -2007,7 +2013,7 @@ void FS_CreatePath(char *pname, int relativeto) snprintf(fullname, sizeof(fullname), "%sfte/%s", com_quakedir, pname); break; default: - Sys_Error("FS_CreatePath: Bad relative path"); + Sys_Error("FS_CreatePath: Bad relative path (%i)", relativeto); break; } COM_CreatePath(fullname);