thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade rcheevos to latest

Browse source 
The timer issue has been fixed upstream. Hopefully nothing will regress on
32-bit Android this time.

See #17631
This commit is contained in:
Henrik Rydgård 2023-08-28 14:05:50 +02:00
parent 9305d235e0
commit b637a9c42e
3 changed files with 3 additions and 5 deletions
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. // Else update it.
entry.numericID = achievementID; entry.numericID = achievementID;
entry.endTime = now + 2.0f; // forever_s; entry.endTime = now + forever_s;
return; return;
} }
} }
@ -138,7 +138,7 @@ void OnScreenDisplay::ShowAchievementProgress(int achievementID, bool show) {
entry.numericID = achievementID; entry.numericID = achievementID;
entry.type = OSDType::ACHIEVEMENT_PROGRESS; entry.type = OSDType::ACHIEVEMENT_PROGRESS;
entry.startTime = now; entry.startTime = now;
entry.endTime = now + 2.0f; // forever_s; entry.endTime = now + forever_s;
entries_.insert(entries_.begin(), entry); 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. // 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); g_OSD.ShowAchievementProgress(event->achievement->id, true);
break; break;
/*
case RC_CLIENT_EVENT_ACHIEVEMENT_PROGRESS_INDICATOR_UPDATE: 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); 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); 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. // 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); g_OSD.ShowAchievementProgress(0, false);
break; break;
*/
case RC_CLIENT_EVENT_LEADERBOARD_TRACKER_SHOW: case RC_CLIENT_EVENT_LEADERBOARD_TRACKER_SHOW:
INFO_LOG(ACHIEVEMENTS, "Leaderboard tracker show: '%s' (id %d)", event->leaderboard_tracker->display, event->leaderboard_tracker->id); 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. // 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