Skip to content

Commit b637a9c

Browse files
committed
Upgrade rcheevos to latest
The timer issue has been fixed upstream. Hopefully nothing will regress on 32-bit Android this time. See #17631
1 parent 9305d23 commit b637a9c

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

Common/System/OSD.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void OnScreenDisplay::ShowAchievementProgress(int achievementID, bool show) {
123123
}
124124
// Else update it.
125125
entry.numericID = achievementID;
126-
entry.endTime = now + 2.0f; // forever_s;
126+
entry.endTime = now + forever_s;
127127
return;
128128
}
129129
}
@@ -138,7 +138,7 @@ void OnScreenDisplay::ShowAchievementProgress(int achievementID, bool show) {
138138
entry.numericID = achievementID;
139139
entry.type = OSDType::ACHIEVEMENT_PROGRESS;
140140
entry.startTime = now;
141-
entry.endTime = now + 2.0f; // forever_s;
141+
entry.endTime = now + forever_s;
142142
entries_.insert(entries_.begin(), entry);
143143
}
144144

Core/RetroAchievements.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ static void event_handler_callback(const rc_client_event_t *event, rc_client_t *
302302
// 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.
303303
g_OSD.ShowAchievementProgress(event->achievement->id, true);
304304
break;
305-
/*
306305
case RC_CLIENT_EVENT_ACHIEVEMENT_PROGRESS_INDICATOR_UPDATE:
307306
INFO_LOG(ACHIEVEMENTS, "Progress indicator update: %s, progress: '%s' (%f)", event->achievement->title, event->achievement->measured_progress, event->achievement->measured_percent);
308307
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 *
315314
// 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.
316315
g_OSD.ShowAchievementProgress(0, false);
317316
break;
318-
*/
319317
case RC_CLIENT_EVENT_LEADERBOARD_TRACKER_SHOW:
320318
INFO_LOG(ACHIEVEMENTS, "Leaderboard tracker show: '%s' (id %d)", event->leaderboard_tracker->display, event->leaderboard_tracker->id);
321319
// A leaderboard_tracker has become active. The handler should show the tracker text on screen.

0 commit comments

Comments
 (0)