From 3cf47056f239f1096590c27c1d401904a54f84fc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 May 2017 17:50:47 +0300
Subject: Add subdir support in VirtFs::loadFile.

---
 src/fs/virtfs/fszip.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/fs/virtfs/fszip.cpp')

diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp
index f2f16bcbb..91d323cc1 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -658,10 +658,13 @@ namespace FsZip
     }
 
     const char *loadFile(FsEntry *restrict const entry,
-                         const std::string &restrict filename,
+                         std::string filename,
                          int &restrict fileSize)
     {
         ZipEntry *const zipEntry = static_cast<ZipEntry*>(entry);
+        const std::string subDir = zipEntry->subDir;
+        if (subDir != dirSeparator)
+            filename = pathJoin(subDir, filename);
         FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
                   it2,
                   zipEntry->mHeaders)
-- 
cgit v1.2.3-60-g2f50