piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11946 from Dentomologist/convert_fromwhichroot_to_enum_class

Browse Source 
Common: Convert FromWhichRoot to enum class
This commit is contained in:
Admiral H. Curtiss
2023-06-14 13:29:07 +02:00
committed by GitHub
parent 88ff00a05c 7ff7c9e84f
commit bd125733f0
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Movie.cpp
View File

@ -1473,8 +1473,8 @@ void GetSettings()
if (SConfig::GetInstance().bWii)
{
u64 title_id = SConfig::GetInstance().GetTitleID();
s_bClearSave = !File::Exists(Common::GetTitleDataPath(title_id, Common::FROM_SESSION_ROOT) +
"/banner.bin");
s_bClearSave = !File::Exists(
Common::GetTitleDataPath(title_id, Common::FromWhichRoot::Session) + "/banner.bin");
}
else
{

2
Source/Core/Core/WiiRoot.cpp
View File

@ -356,7 +356,7 @@ void InitializeWiiFileSystemContents(
File::CreateDirs(save_redirect->m_target_path);
if (save_redirect->m_clone)
{
File::Copy(Common::GetTitleDataPath(title_id, Common::FROM_SESSION_ROOT),
File::Copy(Common::GetTitleDataPath(title_id, Common::FromWhichRoot::Session),
save_redirect->m_target_path);
}
}

6
Source/Core/Core/WiiUtils.cpp
View File

@ -870,7 +870,7 @@ static NANDCheckResult CheckNAND(IOS::HLE::Kernel& ios, bool repair)
// Check for NANDs that were used with old Dolphin versions.
const std::string sys_replace_path =
Common::RootUserPath(Common::FROM_CONFIGURED_ROOT) + "/sys/replace";
Common::RootUserPath(Common::FromWhichRoot::Configured) + "/sys/replace";
if (File::Exists(sys_replace_path))
{
ERROR_LOG_FMT(CORE,
@ -882,7 +882,7 @@ static NANDCheckResult CheckNAND(IOS::HLE::Kernel& ios, bool repair)
}
// Clean up after a bug fixed in https://github.com/dolphin-emu/dolphin/pull/8802
const std::string rfl_db_path = Common::GetMiiDatabasePath(Common::FROM_CONFIGURED_ROOT);
const std::string rfl_db_path = Common::GetMiiDatabasePath(Common::FromWhichRoot::Configured);
const File::FileInfo rfl_db(rfl_db_path);
if (rfl_db.Exists() && rfl_db.GetSize() == 0)
{
@ -895,7 +895,7 @@ static NANDCheckResult CheckNAND(IOS::HLE::Kernel& ios, bool repair)
for (const u64 title_id : es.GetInstalledTitles())
{
const std::string title_dir = Common::GetTitlePath(title_id, Common::FROM_CONFIGURED_ROOT);
const std::string title_dir = Common::GetTitlePath(title_id, Common::FromWhichRoot::Configured);
const std::string content_dir = title_dir + "/content";
const std::string data_dir = title_dir + "/data";