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

sceNpTrophy: minor optimizations

This commit is contained in:
Megamouse 2019-12-19 02:57:40 +01:00
parent 6388c98073
commit 7fcef227af
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
View File

@ -378,7 +378,7 @@ error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle,
} }
} }
std::string trophyPath = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name; const std::string trophyPath = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name;
if (!trp.Install(trophyPath)) if (!trp.Install(trophyPath))
{ {
sceNpTrophy.error("sceNpTrophyRegisterContext(): Failed to install trophy context '%s' (%s)", trophyPath, fs::g_tls_error); sceNpTrophy.error("sceNpTrophyRegisterContext(): Failed to install trophy context '%s' (%s)", trophyPath, fs::g_tls_error);
@ -386,8 +386,8 @@ error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle,
} }
TROPUSRLoader* tropusr = new TROPUSRLoader(); TROPUSRLoader* tropusr = new TROPUSRLoader();
std::string trophyUsrPath = trophyPath + "/TROPUSR.DAT"; const std::string trophyUsrPath = trophyPath + "/TROPUSR.DAT";
std::string trophyConfPath = trophyPath + "/TROPCONF.SFM"; const std::string trophyConfPath = trophyPath + "/TROPCONF.SFM";
tropusr->Load(trophyUsrPath, trophyConfPath); tropusr->Load(trophyUsrPath, trophyConfPath);
ctxt->tropusr.reset(tropusr); ctxt->tropusr.reset(tropusr);
@ -612,8 +612,6 @@ error_code sceNpTrophyGetGameInfo(u32 context, u32 handle, vm::ptr<SceNpTrophyGa
if (n_name == "trophy") if (n_name == "trophy")
{ {
u32 trophy_id = atoi(n->GetAttribute("id").c_str());
if (details) if (details)
{ {
details->numTrophies++; details->numTrophies++;
@ -628,6 +626,8 @@ error_code sceNpTrophyGetGameInfo(u32 context, u32 handle, vm::ptr<SceNpTrophyGa
if (data) if (data)
{ {
const u32 trophy_id = atoi(n->GetAttribute("id").c_str());
if (ctxt->tropusr->GetTrophyUnlockState(trophy_id)) if (ctxt->tropusr->GetTrophyUnlockState(trophy_id))
{ {
data->unlockedTrophies++; data->unlockedTrophies++;
@ -691,7 +691,7 @@ error_code sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, vm::pt
if (g_cfg.misc.show_trophy_popups) if (g_cfg.misc.show_trophy_popups)
{ {
// Figure out how many zeros are needed for padding. (either 0, 1, or 2) // Figure out how many zeros are needed for padding. (either 0, 1, or 2)
std::string padding = ""; std::string padding = "";
if (trophyId < 10) if (trophyId < 10)
{ {
@ -703,17 +703,16 @@ error_code sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, vm::pt
} }
// Get icon for the notification. // Get icon for the notification.
std::string paddedTrophyId = padding + std::to_string(trophyId); const std::string padded_trophy_id = padding + std::to_string(trophyId);
std::string trophyIconPath = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROP" + paddedTrophyId + ".PNG"; const std::string trophy_icon_path = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROP" + padded_trophy_id + ".PNG";
fs::file trophyIconFile = fs::file(vfs::get(trophyIconPath)); fs::file trophy_icon_file = fs::file(vfs::get(trophy_icon_path));
size_t iconSize = trophyIconFile.size(); std::vector<uchar> trophy_icon_data;
std::vector<uchar> trophyIconData; trophy_icon_file.read(trophy_icon_data, trophy_icon_file.size());
trophyIconFile.read(trophyIconData, iconSize);
vm::var<SceNpTrophyDetails> details({0}); vm::var<SceNpTrophyDetails> details({0});
vm::var<SceNpTrophyData> _({0}); vm::var<SceNpTrophyData> _({0});
s32 ret = sceNpTrophyGetTrophyInfo(context, handle, trophyId, details, _); const s32 ret = sceNpTrophyGetTrophyInfo(context, handle, trophyId, details, _);
if (ret != CELL_OK) if (ret != CELL_OK)
{ {
sceNpTrophy.error("Failed to get info for trophy dialog. Error code %x", ret); sceNpTrophy.error("Failed to get info for trophy dialog. Error code %x", ret);
@ -722,7 +721,7 @@ error_code sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, vm::pt
if (auto trophy_notification_dialog = Emu.GetCallbacks().get_trophy_notification_dialog()) if (auto trophy_notification_dialog = Emu.GetCallbacks().get_trophy_notification_dialog())
{ {
trophy_notification_dialog->ShowTrophyNotification(*details, trophyIconData); trophy_notification_dialog->ShowTrophyNotification(*details, trophy_icon_data);
} }
} }
@ -844,7 +843,10 @@ error_code sceNpTrophyGetTrophyInfo(u32 context, u32 handle, s32 trophyId, vm::p
{ {
found = true; found = true;
if (n->GetAttribute("hidden")[0] == 'y' && !ctxt->tropusr->GetTrophyUnlockState(trophyId)) // Trophy is hidden const bool hidden = n->GetAttribute("hidden")[0] == 'y';
const bool unlocked = !!ctxt->tropusr->GetTrophyUnlockState(trophyId);
if (hidden && !unlocked) // Trophy is hidden
{ {
return SCE_NP_TROPHY_ERROR_HIDDEN; return SCE_NP_TROPHY_ERROR_HIDDEN;
} }
@ -852,6 +854,8 @@ error_code sceNpTrophyGetTrophyInfo(u32 context, u32 handle, s32 trophyId, vm::p
if (details) if (details)
{ {
details->trophyId = trophyId; details->trophyId = trophyId;
details->hidden = hidden;
switch (n->GetAttribute("ttype")[0]) switch (n->GetAttribute("ttype")[0])
{ {
case 'B': details->trophyGrade = SCE_NP_TROPHY_GRADE_BRONZE; break; case 'B': details->trophyGrade = SCE_NP_TROPHY_GRADE_BRONZE; break;
@ -860,12 +864,6 @@ error_code sceNpTrophyGetTrophyInfo(u32 context, u32 handle, s32 trophyId, vm::p
case 'P': details->trophyGrade = SCE_NP_TROPHY_GRADE_PLATINUM; break; case 'P': details->trophyGrade = SCE_NP_TROPHY_GRADE_PLATINUM; break;
} }
switch (n->GetAttribute("hidden")[0])
{
case 'y': details->hidden = true; break;
case 'n': details->hidden = false; break;
}
for (std::shared_ptr<rXmlNode> n2 = n->GetChildren(); n2; n2 = n2->GetNext()) for (std::shared_ptr<rXmlNode> n2 = n->GetChildren(); n2; n2 = n2->GetNext())
{ {
const std::string n2_name = n2->GetName(); const std::string n2_name = n2->GetName();
@ -884,7 +882,7 @@ error_code sceNpTrophyGetTrophyInfo(u32 context, u32 handle, s32 trophyId, vm::p
if (data) if (data)
{ {
data->trophyId = trophyId; data->trophyId = trophyId;
data->unlocked = ctxt->tropusr->GetTrophyUnlockState(trophyId) != 0; // ??? data->unlocked = unlocked;
data->timestamp = ctxt->tropusr->GetTrophyTimestamp(trophyId); data->timestamp = ctxt->tropusr->GetTrophyTimestamp(trophyId);
} }
break; break;

5
rpcs3/Loader/TROPUSR.cpp
View File

@ -158,7 +158,8 @@ bool TROPUSRLoader::Generate(const std::string& filepath, const std::string& con
{ {
if (n->GetName() == "trophy") if (n->GetName() == "trophy")
{ {
u32 trophy_id = std::atoi(n->GetAttribute("id").c_str()); const u32 trophy_id = std::atoi(n->GetAttribute("id").c_str());
u32 trophy_grade; u32 trophy_grade;
switch (n->GetAttribute("ttype")[0]) switch (n->GetAttribute("ttype")[0])
{ {
@ -219,7 +220,7 @@ u32 TROPUSRLoader::GetTrophyUnlockState(u32 id)
{ {
if (id >= m_table6.size()) if (id >= m_table6.size())
{ {
LOG_WARNING(LOADER, "TROPUSRLoader::GetUnlockState: Invalid id=%d", id); LOG_WARNING(LOADER, "TROPUSRLoader::GetTrophyUnlockState: Invalid id=%d", id);
return 0; return 0;
} }