From 3cf47056f239f1096590c27c1d401904a54f84fc Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 16 May 2017 17:50:47 +0300 Subject: Add subdir support in VirtFs::loadFile. --- src/fs/virtfs/fsdir.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fs/virtfs/fsdir.cpp') diff --git a/src/fs/virtfs/fsdir.cpp b/src/fs/virtfs/fsdir.cpp index 2e69dedb1..bafe3d2e3 100644 --- a/src/fs/virtfs/fsdir.cpp +++ b/src/fs/virtfs/fsdir.cpp @@ -458,11 +458,11 @@ namespace FsDir } const char *loadFile(FsEntry *restrict const entry, - const std::string &restrict filename, + std::string filename, int &restrict fileSize) { const DirEntry *const dirEntry = static_cast(entry); - const std::string path = entry->root + filename; + const std::string path = entry->root + entry->subDir + filename; if (Files::existsLocal(path) == false) return nullptr; FILEHTYPE fd = FILEOPEN(path.c_str(), -- cgit v1.2.3-70-g09d2