Merge pull request #22 from bunnei/loader-improvements

Refactor loader code and add preliminary NCCH support

2 files changed, 5 insertions, 7 deletions

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index f8511641..421b2af5 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -5,7 +5,7 @@
 #include "bootmanager.hxx"
 
 #include "core/core.h"
-#include "core/loader.h"
+#include "core/loader/loader.h"
 #include "core/hw/hw.h"
 
 #include "video_core/video_core.h"
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 087716c0..0bcce7d1 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -23,9 +23,10 @@
 #include "debugger/graphics_cmdlists.hxx"
 
 #include "core/system.h"
-#include "core/loader.h"
 #include "core/core.h"
+#include "core/loader/loader.h"
 #include "core/arm/disassembler/load_symbol_map.h"
+
 #include "version.h"
 
 
@@ -134,11 +135,8 @@ void GMainWindow::BootGame(const char* filename)
 
     // Load a game or die...
     std::string boot_filename = filename;
-    std::string error_str;
-    bool res = Loader::LoadFile(boot_filename, &error_str);
-
-    if (!res) {
-        ERROR_LOG(BOOT, "Failed to load ROM: %s", error_str.c_str());
+    if (Loader::ResultStatus::Success != Loader::LoadFile(boot_filename)) {
+        ERROR_LOG(BOOT, "Failed to load ROM!");
     }
 
     disasmWidget->Init();