ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IOP HLE: Rename update host root functions

This commit is contained in:
Daniel Gerendasy 2023-11-09 21:53:32 -08:00 committed by Connor McLaughlin
parent b5f8ef0106
commit 4af89576aa
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/IopBios.cpp
View File

@ -95,20 +95,13 @@ typedef struct
static std::string hostRoot;
void Hle_SetElfPath(const char* elfFileName)
void Hle_SetHostRoot(const char* bootFilename)
{
DevCon.WriteLn("HLE Host: Will load ELF: %s\n", elfFileName);
hostRoot = Path::ToNativePath(Path::GetDirectory(elfFileName));
hostRoot = Path::ToNativePath(Path::GetDirectory(bootFilename));
Console.WriteLn("HLE Host: Set 'host:' root path to: %s\n", hostRoot.c_str());
}
void Hle_SetIsoPath(const char* isoFilename)
{
hostRoot = Path::ToNativePath(Path::GetDirectory(isoFilename));
Console.WriteLn("HLE Host: Set 'host:' root path to: %s\n", hostRoot.c_str());
}
void Hle_ClearElfPath()
void Hle_ClearHostRoot()
{
hostRoot = {};
}

5
pcsx2/IopBios.h
View File

@ -86,7 +86,6 @@ namespace R3000A
}
} // namespace R3000A
extern void Hle_SetElfPath(const char* elfFileName);
extern void Hle_SetIsoPath(const char* isoFilename);
extern void Hle_ClearElfPath();
extern void Hle_SetHostRoot(const char* bootFilename);
extern void Hle_ClearHostRoot();

10
pcsx2/VMManager.cpp
View File

@ -1188,15 +1188,15 @@ bool VMManager::Initialize(VMBootParameters boot_params)
return false;
}
Hle_SetElfPath(s_elf_override.c_str());
Hle_SetHostRoot(s_elf_override.c_str());
}
else if (CDVDsys_GetSourceType() == CDVD_SourceType::Iso)
{
Hle_SetIsoPath(CDVDsys_GetFile(CDVDsys_GetSourceType()).c_str());
Hle_SetHostRoot(CDVDsys_GetFile(CDVDsys_GetSourceType()).c_str());
}
else
{
Hle_ClearElfPath();
Hle_ClearHostRoot();
}
// Check for resuming with hardcore mode.
@ -1984,9 +1984,9 @@ bool VMManager::SetELFOverride(std::string path)
s_fast_boot_requested = !s_elf_override.empty() || EmuConfig.EnableFastBoot;
if (s_elf_override.empty())
Hle_ClearElfPath();
Hle_ClearHostRoot();
else
Hle_SetElfPath(s_elf_override.c_str());
Hle_SetHostRoot(s_elf_override.c_str());
Reset();
return true;