Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #22 from bunnei/loader-improvements

Browse source 
Refactor loader code and add preliminary NCCH support
This commit is contained in:
bunnei 2014-06-25 09:46:14 -04:00
commit 469fe42fad
19 changed files with 1203 additions and 925 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/citra_qt/bootmanager.cpp
View file

@ -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"

10
src/citra_qt/main.cpp
View file

@ -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();