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

patch_engine: Apply patch when APP_VER is unknown

Browse source
This commit is contained in:
Megamouse 2020-09-21 11:04:11 +02:00
parent 75c3fdcb6f
commit 511e9920c2
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Utilities/bin_patch.cpp
View file

@ -548,11 +548,6 @@ bool patch_engine::read_patch_node(patch_info& info, YAML::Node node, const YAML
return is_valid; return is_valid;
} }
void patch_engine::append(const std::string& patch)
{
load(m_map, patch);
}
void patch_engine::append_global_patches() void patch_engine::append_global_patches()
{ {
// Legacy patch.yml // Legacy patch.yml

3
Utilities/bin_patch.h
View file

@ -138,9 +138,6 @@ public:
std::size_t apply_with_ls_check(const std::string& name, u8* dst, u32 filesz, u32 ls_addr); std::size_t apply_with_ls_check(const std::string& name, u8* dst, u32 filesz, u32 ls_addr);
private: private:
// Load from file and append to member patches map
void append(const std::string& path);
// Internal: Apply patch (returns the number of entries applied) // Internal: Apply patch (returns the number of entries applied)
template <bool check_local_storage> template <bool check_local_storage>
std::size_t apply_patch(const std::string& name, u8* dst, u32 filesz, u32 ls_addr); std::size_t apply_patch(const std::string& name, u8* dst, u32 filesz, u32 ls_addr);

5
rpcs3/Emu/System.cpp
View file

@ -923,8 +923,9 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
m_title_id = std::string(psf::get_string(_psf, "TITLE_ID")); m_title_id = std::string(psf::get_string(_psf, "TITLE_ID"));
m_cat = std::string(psf::get_string(_psf, "CATEGORY")); m_cat = std::string(psf::get_string(_psf, "CATEGORY"));
m_app_version = std::string(psf::get_string(_psf, "APP_VER", "Unknown")); const auto version_app = psf::get_string(_psf, "APP_VER", "Unknown");
const auto version_disc = psf::get_string(_psf, "VERSION", "Unknown"); const auto version_disc = psf::get_string(_psf, "VERSION", "Unknown");
m_app_version = version_app == "Unknown" ? version_disc : version_app;
if (!_psf.empty() && m_cat.empty()) if (!_psf.empty() && m_cat.empty())
{ {
@ -935,7 +936,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
sys_log.notice("Title: %s", GetTitle()); sys_log.notice("Title: %s", GetTitle());
sys_log.notice("Serial: %s", GetTitleID()); sys_log.notice("Serial: %s", GetTitleID());
sys_log.notice("Category: %s", GetCat()); sys_log.notice("Category: %s", GetCat());
sys_log.notice("Version: %s / %s", GetAppVersion(), version_disc); sys_log.notice("Version: APP_VER=%s VERSION=%s", version_app, version_disc);
if (!add_only && !force_global_config && m_config_override_path.empty()) if (!add_only && !force_global_config && m_config_override_path.empty())
{ {