mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 18:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9905 from Jamiras/cheevos_invalid_reset

Browse Source 
don't reset triggers/lboards that failed to load
This commit is contained in:
Twinaphex 2019-12-28 09:50:58 +01:00 committed by GitHub
commit 7e83f4a531
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cheevos-new/cheevos.c
View File

@ -897,28 +897,32 @@ void rcheevos_reset_game(void)
cheevo = rcheevos_locals.core; cheevo = rcheevos_locals.core;
for (i = 0; i < rcheevos_locals.patchdata.core_count; i++, cheevo++) for (i = 0; i < rcheevos_locals.patchdata.core_count; i++, cheevo++)
{ {
rc_reset_trigger(cheevo->trigger); if (cheevo->trigger)
rc_reset_trigger(cheevo->trigger);
cheevo->last = 1; cheevo->last = 1;
} }
cheevo = rcheevos_locals.unofficial; cheevo = rcheevos_locals.unofficial;
for (i = 0; i < rcheevos_locals.patchdata.unofficial_count; i++, cheevo++) for (i = 0; i < rcheevos_locals.patchdata.unofficial_count; i++, cheevo++)
{ {
rc_reset_trigger(cheevo->trigger); if (cheevo->trigger)
rc_reset_trigger(cheevo->trigger);
cheevo->last = 1; cheevo->last = 1;
} }
lboard = rcheevos_locals.lboards; lboard = rcheevos_locals.lboards;
for (i = 0; i < rcheevos_locals.patchdata.lboard_count; i++, lboard++) for (i = 0; i < rcheevos_locals.patchdata.lboard_count; i++, lboard++)
{ {
rc_reset_lboard(lboard->lboard); if (lboard->lboard)
rc_reset_lboard(lboard->lboard);
if (lboard->active) if (lboard->active)
{ {
lboard->active = 0; lboard->active = 0;
/* this ensures the leaderboard won't restart until the start trigger is false for at least one frame */ /* this ensures the leaderboard won't restart until the start trigger is false for at least one frame */
lboard->lboard->submitted = 1; if (lboard->lboard)
lboard->lboard->submitted = 1;
} }
} }
} }