Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 07:20:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #17997 from hrydgard/upgrade-rcheevos-again

Browse Source 
Upgrade rcheevos to latest
This commit is contained in:
Henrik Rydgård 2023-08-28 14:50:16 +02:00 committed by GitHub
commit 08604f184b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/System/OSD.cpp
View File

@ -123,7 +123,7 @@ void OnScreenDisplay::ShowAchievementProgress(int achievementID, bool show) {
}
// Else update it.
entry.numericID = achievementID;
entry.endTime = now + 2.0f; // forever_s;
entry.endTime = now + forever_s;
return;
}
}
@ -138,7 +138,7 @@ void OnScreenDisplay::ShowAchievementProgress(int achievementID, bool show) {
entry.numericID = achievementID;
entry.type = OSDType::ACHIEVEMENT_PROGRESS;
entry.startTime = now;
entry.endTime = now + 2.0f; // forever_s;
entry.endTime = now + forever_s;
entries_.insert(entries_.begin(), entry);
}

2
Core/RetroAchievements.cpp
View File

@ -302,7 +302,6 @@ static void event_handler_callback(const rc_client_event_t *event, rc_client_t *
// If a progress indicator is already visible, it should be updated with the new icon and text, and the two second timer should be restarted.
g_OSD.ShowAchievementProgress(event->achievement->id, true);
break;
/*
case RC_CLIENT_EVENT_ACHIEVEMENT_PROGRESS_INDICATOR_UPDATE:
INFO_LOG(ACHIEVEMENTS, "Progress indicator update: %s, progress: '%s' (%f)", event->achievement->title, event->achievement->measured_progress, event->achievement->measured_percent);
g_OSD.ShowAchievementProgress(event->achievement->id, true);
@ -315,7 +314,6 @@ static void event_handler_callback(const rc_client_event_t *event, rc_client_t *
// If a progress indicator is already visible, it should be updated with the new icon and text, and the two second timer should be restarted.
g_OSD.ShowAchievementProgress(0, false);
break;
*/
case RC_CLIENT_EVENT_LEADERBOARD_TRACKER_SHOW:
INFO_LOG(ACHIEVEMENTS, "Leaderboard tracker show: '%s' (id %d)", event->leaderboard_tracker->display, event->leaderboard_tracker->id);
// A leaderboard_tracker has become active. The handler should show the tracker text on screen.

2
ext/rcheevos

@ -1 +1 @@
Subproject commit 97db619aa4de15fe19887255e75899ae65d2e432
Subproject commit 813163c10c0745322affb8342ca2ab3bb30bfcbf