RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Fix boot by RPCS3_GAMEID constants

Browse Source
This commit is contained in:
Megamouse 2023-02-20 21:28:19 +01:00
parent 3922f76ab5
commit 364c33060b
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Emu/System.cpp
View File

@ -1014,9 +1014,9 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
m_path_old = m_path; m_path_old = m_path;
resolve_path_as_vfs_path = true; resolve_path_as_vfs_path = true;
} }
else if (m_path.starts_with("%RPCS3_VFS%:")) else if (m_path.starts_with(vfs_boot_prefix))
{ {
m_path = m_path.substr(("%RPCS3_VFS%:"sv).size()); m_path = m_path.substr(vfs_boot_prefix.size());
if (!m_path.empty() && m_path[0] != '/') if (!m_path.empty() && m_path[0] != '/')
{ {
@ -1035,10 +1035,10 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
resolve_path_as_vfs_path = true; resolve_path_as_vfs_path = true;
} }
else if (m_path.starts_with("%RPCS3_GAMEID%:")) else if (m_path.starts_with(game_id_boot_prefix))
{ {
// Try to boot a game through game ID only // Try to boot a game through game ID only
m_title_id = m_path.substr(("%RPCS3_GAMEID%:"sv).size()); m_title_id = m_path.substr(game_id_boot_prefix.size());
m_title_id = m_title_id.substr(0, m_title_id.find_first_of(fs::delim)); m_title_id = m_title_id.substr(0, m_title_id.find_first_of(fs::delim));
if (m_title_id.size() < 3 && m_title_id.find_first_not_of('.') == umax) if (m_title_id.size() < 3 && m_title_id.find_first_not_of('.') == umax)
@ -1048,7 +1048,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
return game_boot_result::invalid_file_or_folder; return game_boot_result::invalid_file_or_folder;
} }
std::string tail = m_path.substr(("%RPCS3_GAMEID%:"sv).size() + m_title_id.size()); std::string tail = m_path.substr(game_id_boot_prefix.size() + m_title_id.size());
if (tail.find_first_not_of(fs::delim) == umax) if (tail.find_first_not_of(fs::delim) == umax)
{ {

3
rpcs3/Emu/System.h
View File

@ -159,6 +159,9 @@ class Emulator final
} }
public: public:
static constexpr std::string_view game_id_boot_prefix = "%RPCS3_GAMEID%:";
static constexpr std::string_view vfs_boot_prefix = "%RPCS3_VFS%:";
Emulator() = default; Emulator() = default;
void SetCallbacks(EmuCallbacks&& cb) void SetCallbacks(EmuCallbacks&& cb)

8
rpcs3/main.cpp
View File

@ -1193,13 +1193,13 @@ int main(int argc, char** argv)
{ {
std::string spath = sstr(::at32(args, 0)); std::string spath = sstr(::at32(args, 0));
if (spath.starts_with("%RPCS3_VFS%")) if (spath.starts_with(Emulator::vfs_boot_prefix))
{ {
sys_log.notice("Booting application from command line using VFS path: %s", spath.substr(("%RPCS3_VFS%"sv).size())); sys_log.notice("Booting application from command line using VFS path: %s", spath.substr(Emulator::vfs_boot_prefix.size()));
} }
else if (spath.starts_with("%RPCS3_GAMEID%")) else if (spath.starts_with(Emulator::game_id_boot_prefix))
{ {
sys_log.notice("Booting application from command line using GAMEID: %s", spath.substr(("%RPCS3_GAMEID%"sv).size())); sys_log.notice("Booting application from command line using GAMEID: %s", spath.substr(Emulator::game_id_boot_prefix.size()));
} }
else else
{ {