summaryrefslogtreecommitdiffstats
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-12 02:20:19 +0200
committerLioncash <mathew1800@gmail.com>2018-08-12 02:20:21 +0200
commit0a93b45b6a2662c69320e6c69f8024e26909a168 (patch)
treea16166777acb3d5af7915496827408e1ec7025bd /src/core/core.cpp
parentMerge pull request #1010 from bunnei/unk-vert-attrib-shader (diff)
downloadyuzu-0a93b45b6a2662c69320e6c69f8024e26909a168.tar
yuzu-0a93b45b6a2662c69320e6c69f8024e26909a168.tar.gz
yuzu-0a93b45b6a2662c69320e6c69f8024e26909a168.tar.bz2
yuzu-0a93b45b6a2662c69320e6c69f8024e26909a168.tar.lz
yuzu-0a93b45b6a2662c69320e6c69f8024e26909a168.tar.xz
yuzu-0a93b45b6a2662c69320e6c69f8024e26909a168.tar.zst
yuzu-0a93b45b6a2662c69320e6c69f8024e26909a168.zip
Diffstat (limited to '')
-rw-r--r--src/core/core.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 6b8004eb2..83d4d742b 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -88,7 +88,7 @@ System::ResultStatus System::SingleStep() {
return RunLoop(false);
}
-System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& filepath) {
+System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::string& filepath) {
app_loader = Loader::GetLoader(virtual_filesystem->OpenFile(filepath, FileSys::Mode::Read));
if (!app_loader) {
@@ -151,7 +151,7 @@ Cpu& System::CpuCore(size_t core_index) {
return *cpu_cores[core_index];
}
-System::ResultStatus System::Init(EmuWindow& emu_window) {
+System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) {
LOG_DEBUG(HW_Memory, "initialized OK");
CoreTiming::Init();