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

Some cleanup

Browse source 
* Prefer default initializer over std::memset 0 when possible and more readable.
* Use std::format in trophy files name obtaining.
* Use vm::ptr<>::operator bool() instead of comparing vm::ptr to vm::null or using addr().
* Add a few std::memset calls in hle where it matters (or in some places just to document an actual firmware memcpy call).
This commit is contained in:
Eladash 2019-12-20 05:51:16 +02:00 • committed by Ivan
parent 5de83e0425
commit 9690854e58
20 changed files with 52 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
View file

@ -588,9 +588,9 @@ error_code sceNpTrophyGetGameInfo(u32 context, u32 handle, vm::ptr<SceNpTrophyGa
}
if (details)
memset(details.get_ptr(), 0, sizeof(SceNpTrophyGameDetails));
*details = {};
if (data)
memset(data.get_ptr(), 0, sizeof(SceNpTrophyGameData));
*data = {};
for (std::shared_ptr<rXmlNode> n = trophy_base->GetChildren(); n; n = n->GetNext())
{
@ -691,19 +691,8 @@ error_code sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, vm::pt
if (g_cfg.misc.show_trophy_popups)
{
// Figure out how many zeros are needed for padding. (either 0, 1, or 2)
std::string padding = "";
if (trophyId < 10)
{
padding = "00";
}
else if (trophyId < 100)
{
padding = "0";
}
// Get icon for the notification.
const std::string padded_trophy_id = padding + std::to_string(trophyId);
const std::string padded_trophy_id = fmt::format("%03u", trophyId);
const std::string trophy_icon_path = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROP" + padded_trophy_id + ".PNG";
fs::file trophy_icon_file = fs::file(vfs::get(trophy_icon_path));
std::vector<uchar> trophy_icon_data;
@ -823,9 +812,9 @@ error_code sceNpTrophyGetTrophyInfo(u32 context, u32 handle, s32 trophyId, vm::p
}
if (details)
memset(details.get_ptr(), 0, sizeof(SceNpTrophyDetails));
*details = {};
if (data)
memset(data.get_ptr(), 0, sizeof(SceNpTrophyData));
*data = {};
rXmlDocument doc;
doc.Read(config.to_string());