mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-03 16:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

various fixes

Browse Source
This commit is contained in:
CrazyBloo 2024-09-11 20:06:08 -04:00
parent 66a411263e
commit 447d687fbc
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/core/libraries/np_trophy/np_trophy.cpp
View File

@ -75,7 +75,7 @@ bool ORBIS_NP_TROPHY_FLAG_ISSET(int32_t trophyId, OrbisNpTrophyFlagArray* p) {
} }
OrbisNpTrophyGrade GetTrophyGradeFromChar(char trophyType) { OrbisNpTrophyGrade GetTrophyGradeFromChar(char trophyType) {
switch (trophyType) { switch (trophyType) {
default: default:
return ORBIS_NP_TROPHY_GRADE_UNKNOWN; return ORBIS_NP_TROPHY_GRADE_UNKNOWN;
break; break;
@ -295,7 +295,8 @@ int PS4_SYSV_ABI sceNpTrophyGetGameInfo(OrbisNpTrophyContext context, OrbisNpTro
} }
} }
} }
details->numGroups = numGroups;
details->numTrophies = numTrophies; details->numTrophies = numTrophies;
details->numPlatinum = numTrophiesByRarity[ORBIS_NP_TROPHY_GRADE_PLATINUM]; details->numPlatinum = numTrophiesByRarity[ORBIS_NP_TROPHY_GRADE_PLATINUM];
details->numGold = numTrophiesByRarity[ORBIS_NP_TROPHY_GRADE_GOLD]; details->numGold = numTrophiesByRarity[ORBIS_NP_TROPHY_GRADE_GOLD];
@ -370,14 +371,17 @@ int PS4_SYSV_ABI sceNpTrophyGetGroupInfo(OrbisNpTrophyContext context, OrbisNpTr
if (std::string(it->name()) == "group") { if (std::string(it->name()) == "group") {
numGroups++; numGroups++;
std::string currentGroupId = it->attribute("id").value(); std::string currentGroupId = it->attribute("id").value();
if (std::stoi(currentGroupId) == groupId) { if (!currentGroupId.empty()) {
std::string currentGroupName = it->child("name").text().as_string(); if (std::stoi(currentGroupId) == groupId) {
std::string currentGroupDescription = it->child("detail").text().as_string(); std::string currentGroupName = it->child("name").text().as_string();
std::string currentGroupDescription =
it->child("detail").text().as_string();
strncpy(details->title, currentGroupName.c_str(), strncpy(details->title, currentGroupName.c_str(),
ORBIS_NP_TROPHY_GROUP_TITLE_MAX_SIZE); ORBIS_NP_TROPHY_GROUP_TITLE_MAX_SIZE);
strncpy(details->description, currentGroupDescription.c_str(), strncpy(details->description, currentGroupDescription.c_str(),
ORBIS_NP_TROPHY_GAME_DESCR_MAX_SIZE); ORBIS_NP_TROPHY_GAME_DESCR_MAX_SIZE);
}
} }
} }
@ -388,14 +392,16 @@ int PS4_SYSV_ABI sceNpTrophyGetGroupInfo(OrbisNpTrophyContext context, OrbisNpTr
std::string currentTrophyGrade = it->attribute("ttype").value(); std::string currentTrophyGrade = it->attribute("ttype").value();
std::string currentTrophyGroupID = it->attribute("gid").value(); std::string currentTrophyGroupID = it->attribute("gid").value();
if (std::stoi(currentTrophyGroupID) == groupId) { if (!currentTrophyGroupID.empty()) {
numTrophies++; if (std::stoi(currentTrophyGroupID) == groupId) {
if (!currentTrophyGrade.empty()) { numTrophies++;
int trophyGrade = GetTrophyGradeFromChar(currentTrophyGrade.at(0)); if (!currentTrophyGrade.empty()) {
numTrophiesByRarity[trophyGrade]++; int trophyGrade = GetTrophyGradeFromChar(currentTrophyGrade.at(0));
if (currentTrophyUnlockState == "unlocked") { numTrophiesByRarity[trophyGrade]++;
unlockedTrophies++; if (currentTrophyUnlockState == "unlocked") {
unlockedTrophiesByRarity[trophyGrade]++; unlockedTrophies++;
unlockedTrophiesByRarity[trophyGrade]++;
}
} }
} }
} }
@ -988,7 +994,8 @@ int PS4_SYSV_ABI sceNpTrophyUnlockTrophy(OrbisNpTrophyContext context, OrbisNpTr
it->append_attribute("timestamp") = it->append_attribute("timestamp") =
std::to_string(trophyTimestamp.tick).c_str(); std::to_string(trophyTimestamp.tick).c_str();
} else { } else {
it->attribute("timestamp").set_value(std::to_string(trophyTimestamp.tick).c_str()); it->attribute("timestamp")
.set_value(std::to_string(trophyTimestamp.tick).c_str());
} }
g_trophy_ui.AddTrophyToQueue(trophyId, currentTrophyName); g_trophy_ui.AddTrophyToQueue(trophyId, currentTrophyName);