summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-11-28 14:00:44 -0500
committerGravatar Zach Hilman2018-12-03 17:20:34 -0500
commitc7b41ade74f55bd910414f20bbcc62a68101d768 (patch)
tree2f6a79d4136f4d9e9864c9feecb1b722c515fa5a /src/core/core.cpp
parentconfig: Store and load disabled add-ons list (diff)
downloadyuzu-c7b41ade74f55bd910414f20bbcc62a68101d768.tar.gz
yuzu-c7b41ade74f55bd910414f20bbcc62a68101d768.tar.xz
yuzu-c7b41ade74f55bd910414f20bbcc62a68101d768.zip
core: Make GetGameFileFromPath function externally accessible
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 795fabc65..ce7851538 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -8,6 +8,7 @@
8#include <thread> 8#include <thread>
9#include <utility> 9#include <utility>
10 10
11#include "common/file_util.h"
11#include "common/logging/log.h" 12#include "common/logging/log.h"
12#include "common/string_util.h" 13#include "common/string_util.h"
13#include "core/arm/exclusive_monitor.h" 14#include "core/arm/exclusive_monitor.h"
@@ -40,7 +41,6 @@ namespace Core {
40 41
41/*static*/ System System::s_instance; 42/*static*/ System System::s_instance;
42 43
43namespace {
44FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, 44FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
45 const std::string& path) { 45 const std::string& path) {
46 // To account for split 00+01+etc files. 46 // To account for split 00+01+etc files.
@@ -69,11 +69,13 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
69 return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(concat, dir->GetName()); 69 return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(concat, dir->GetName());
70 } 70 }
71 71
72 if (FileUtil::IsDirectory(path))
73 return vfs->OpenFile(path + "/" + "main", FileSys::Mode::Read);
74
72 return vfs->OpenFile(path, FileSys::Mode::Read); 75 return vfs->OpenFile(path, FileSys::Mode::Read);
73} 76}
74} // Anonymous namespace
75
76struct System::Impl { 77struct System::Impl {
78
77 Cpu& CurrentCpuCore() { 79 Cpu& CurrentCpuCore() {
78 return cpu_core_manager.GetCurrentCore(); 80 return cpu_core_manager.GetCurrentCore();
79 } 81 }