ahmed2007/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

vfs: Fix typo in VfsFilesystem docs

Browse source
This commit is contained in:
Zach Hilman 2018-08-08 14:34:06 -04:00
parent 2b6128fe0b
commit 94cf327e77
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/file_sys/vfs.h
View file

@ -31,7 +31,7 @@ enum class VfsEntryType {
Directory, Directory,
}; };
// A class represnting an abstract filesystem. A default implementation given the root VirtualDir is // A class representing an abstract filesystem. A default implementation given the root VirtualDir is
// provided for convenience, but if the Vfs implementation has any additional state or // provided for convenience, but if the Vfs implementation has any additional state or
// functionality, they will need to override. // functionality, they will need to override.
struct VfsFilesystem : NonCopyable { struct VfsFilesystem : NonCopyable {

7
src/yuzu/game_list.cpp
View file

@ -15,6 +15,7 @@
#include "common/string_util.h" #include "common/string_util.h"
#include "core/file_sys/content_archive.h" #include "core/file_sys/content_archive.h"
#include "core/file_sys/control_metadata.h" #include "core/file_sys/control_metadata.h"
#include "core/file_sys/romfs.h"
#include "core/file_sys/vfs_real.h" #include "core/file_sys/vfs_real.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "game_list.h" #include "game_list.h"
@ -415,8 +416,8 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign
bool is_dir = FileUtil::IsDirectory(physical_name); bool is_dir = FileUtil::IsDirectory(physical_name);
QFileInfo file_info(physical_name.c_str()); QFileInfo file_info(physical_name.c_str());
if (!is_dir && file_info.suffix().toStdString() == "nca") { if (!is_dir && file_info.suffix().toStdString() == "nca") {
auto nca = std::make_shared<FileSys::NCA>( auto nca =
std::make_shared<FileSys::RealVfsFile>(physical_name)); std::make_shared<FileSys::NCA>(vfs->OpenFile(physical_name, FileSys::Mode::Read));
if (nca->GetType() == FileSys::NCAContentType::Control) if (nca->GetType() == FileSys::NCAContentType::Control)
nca_control_map.insert_or_assign(nca->GetTitleId(), nca); nca_control_map.insert_or_assign(nca->GetTitleId(), nca);
} }
@ -460,7 +461,7 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign
// Use from metadata pool. // Use from metadata pool.
if (nca_control_map.find(program_id) != nca_control_map.end()) { if (nca_control_map.find(program_id) != nca_control_map.end()) {
const auto nca = nca_control_map[program_id]; const auto nca = nca_control_map[program_id];
const auto control_dir = nca->GetSubdirectories()[0]; const auto control_dir = FileSys::ExtractRomFS(nca->GetRomFS());
const auto nacp_file = control_dir->GetFile("control.nacp"); const auto nacp_file = control_dir->GetFile("control.nacp");
FileSys::NACP nacp(nacp_file); FileSys::NACP nacp(nacp_file);