archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 00:11:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Savestates: Rename savestate when booting the game regularly (suspend mode)

Browse source
This commit is contained in:
Eladash 2022-10-23 09:40:31 +03:00 • committed by Megamouse
parent 119b4e4529
commit ee3e36672c
2 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/System.cpp
View file

@ -81,6 +81,7 @@ extern std::pair<std::shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const
extern bool ppu_load_rel_exec(const ppu_rel_object&); extern bool ppu_load_rel_exec(const ppu_rel_object&);
extern bool is_savestate_version_compatible(const std::vector<std::pair<u16, u16>>& data, bool is_boot_check); extern bool is_savestate_version_compatible(const std::vector<std::pair<u16, u16>>& data, bool is_boot_check);
extern std::vector<std::pair<u16, u16>> read_used_savestate_versions(); extern std::vector<std::pair<u16, u16>> read_used_savestate_versions();
std::string get_savestate_path(std::string_view title_id, std::string_view boot_path);
fs::file g_tty; fs::file g_tty;
atomic_t<s64> g_tty_size{0}; atomic_t<s64> g_tty_size{0};
@ -676,9 +677,16 @@ game_boot_result Emulator::BootGame(const std::string& path, const std::string&
auto error = Load(title_id, add_only); auto error = Load(title_id, add_only);
if (g_cfg.savestate.suspend_emu && m_ar) if (g_cfg.savestate.suspend_emu)
{ {
std::string old_path = path.substr(0, path.find_last_not_of(fs::delim) + 1); for (std::string old_path : std::initializer_list<std::string>{m_ar ? path : "", m_title_id.empty() ? "" : get_savestate_path(m_title_id, path)})
{
if (old_path.empty())
{
continue;
}
old_path = old_path.substr(0, old_path.find_last_not_of(fs::delim) + 1);
const usz insert_pos = old_path.find_last_of(fs::delim) + 1; const usz insert_pos = old_path.find_last_of(fs::delim) + 1;
const auto prefix = "used_"sv; const auto prefix = "used_"sv;
@ -692,6 +700,7 @@ game_boot_result Emulator::BootGame(const std::string& path, const std::string&
} }
} }
} }
}
return error; return error;
} }
@ -2505,7 +2514,7 @@ std::shared_ptr<utils::serial> Emulator::Kill(bool allow_autoexit, bool savestat
if (savestate) if (savestate)
{ {
const std::string path = fs::get_cache_dir() + "/savestates/" + (m_title_id.empty() ? m_path.substr(m_path.find_last_of(fs::delim) + 1) : m_title_id) + ".SAVESTAT"; const std::string path = get_savestate_path(m_title_id, m_path);
fs::pending_file file(path); fs::pending_file file(path);

5
rpcs3/Emu/savestate_utils.cpp
View file

@ -146,6 +146,11 @@ bool is_savestate_version_compatible(const std::vector<std::pair<u16, u16>>& dat
return ok; return ok;
} }
std::string get_savestate_path(std::string_view title_id, std::string_view boot_path)
{
return fs::get_cache_dir() + "/savestates/" + std::string{title_id.empty() ? boot_path.substr(boot_path.find_last_of(fs::delim) + 1) : title_id} + ".SAVESTAT";
}
bool is_savestate_compatible(const fs::file& file) bool is_savestate_compatible(const fs::file& file)
{ {
return is_savestate_version_compatible(get_savestate_versioning_data(file), false); return is_savestate_version_compatible(get_savestate_versioning_data(file), false);