Made some changes from review comments:

- Made LoadKernelSystemMode return a pair consisting of a system mode and a result code (Could use review).
- Deleted ErrorOpenGL error code in favor of just having ErrorVideoCore.
- Made dialog messages more clear.
- Compared archive ID in fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic.
- Cleaned up some other stuff.
This commit is contained in:
TheKoopaKingdom 2017-03-08 20:21:31 -05:00
parent 1ecb322daa
commit 37bec598ea
10 changed files with 55 additions and 53 deletions

View file

@ -121,19 +121,16 @@ FileType AppLoader_NCCH::IdentifyType(FileUtil::IOFile& file) {
return FileType::Error;
}
ResultStatus AppLoader_NCCH::LoadKernelSystemMode(boost::optional<u32>& system_mode) {
std::pair<boost::optional<u32>, ResultStatus> AppLoader_NCCH::LoadKernelSystemMode() {
if (!is_loaded) {
ResultStatus res = LoadExeFS();
if (res != ResultStatus::Success) {
// Set the system mode as invalid.
system_mode = boost::none;
// Return the error code.
return res;
return std::make_pair(boost::none, res);
}
}
// Set the system mode as the one from the exheader.
system_mode = exheader_header.arm11_system_local_caps.system_mode.Value();
return ResultStatus::Success;
return std::make_pair(exheader_header.arm11_system_local_caps.system_mode.Value(),
ResultStatus::Success);
}
ResultStatus AppLoader_NCCH::LoadExec() {