mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 16:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-04-27 01:10:44 +02:00
parent 65f33f4403
commit ace37d2c7a
2 changed files with 7 additions and 20 deletions
cheevos
cheevos.c
ui/drivers
ui_win32.c

23
cheevos/cheevos.c

@ -1715,17 +1715,10 @@ static int cheevos_parse(const char *json)
NULL NULL
}; };
unsigned core_count, unofficial_count, lboard_count;
int res;
cheevos_readud_t ud; cheevos_readud_t ud;
settings_t *settings = config_get_ptr(); unsigned core_count, unofficial_count, lboard_count;
/* Just return OK if cheevos are disabled. */
if (!settings->cheevos.enable)
return 0;
/* Count the number of achievements in the JSON file. */ /* Count the number of achievements in the JSON file. */
res = cheevos_count_cheevos(json, &core_count, &unofficial_count, int res = cheevos_count_cheevos(json, &core_count, &unofficial_count,
&lboard_count); &lboard_count);
if (res != JSONSAX_OK) if (res != JSONSAX_OK)
@ -2099,8 +2092,8 @@ static int cheevos_login(retro_time_t *timeout)
urle_pwd[0] = '\0'; urle_pwd[0] = '\0';
request[0] = '\0'; request[0] = '\0';
username = settings->cheevos.username; username = settings->cheevos.username;
password = settings->cheevos.password; password = settings->cheevos.password;
if (!username || !*username || !password || !*password) if (!username || !*username || !password || !*password)
{ {
@ -3101,7 +3094,7 @@ found:
if (cheevos_get_by_game_id(&json, game_id, &timeout) == 0 && json != NULL) if (cheevos_get_by_game_id(&json, game_id, &timeout) == 0 && json != NULL)
#endif #endif
{ {
if (!cheevos_parse(json)) if (!settings->cheevos.enable || !cheevos_parse(json))
{ {
cheevos_deactivate_unlocks(game_id, &timeout); cheevos_deactivate_unlocks(game_id, &timeout);
free((void*)json); free((void*)json);
@ -3127,17 +3120,13 @@ void cheevos_reset_game(void)
const cheevo_t *end = cheevo + cheevos_locals.core.count; const cheevo_t *end = cheevo + cheevos_locals.core.count;
for (; cheevo < end; cheevo++) for (; cheevo < end; cheevo++)
{
cheevo->last = 1; cheevo->last = 1;
}
cheevo = cheevos_locals.unofficial.cheevos; cheevo = cheevos_locals.unofficial.cheevos;
end = cheevo + cheevos_locals.unofficial.count; end = cheevo + cheevos_locals.unofficial.count;
for (; cheevo < end; cheevo++) for (; cheevo < end; cheevo++)
{
cheevo->last = 1; cheevo->last = 1;
}
} }
void cheevos_populate_menu(void *data, bool hardcore) void cheevos_populate_menu(void *data, bool hardcore)
@ -3260,9 +3249,7 @@ bool cheevos_get_description(cheevos_ctx_desc_t *desc)
strlcpy(desc->s, cheevos[desc->idx].description, desc->len); strlcpy(desc->s, cheevos[desc->idx].description, desc->len);
} }
else else
{
*desc->s = 0; *desc->s = 0;
}
return true; return true;
} }

4
ui/drivers/ui_win32.c

@ -701,13 +701,13 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
else if (mode == ID_M_STATE_INDEX_AUTO) else if (mode == ID_M_STATE_INDEX_AUTO)
{ {
signed idx = -1; signed idx = -1;
settings->state_slot = idx; configuration_set_int(settings, settings->state_slot, idx);
} }
else if (mode >= (ID_M_STATE_INDEX_AUTO+1) else if (mode >= (ID_M_STATE_INDEX_AUTO+1)
&& mode <= (ID_M_STATE_INDEX_AUTO+10)) && mode <= (ID_M_STATE_INDEX_AUTO+10))
{ {
signed idx = (mode - (ID_M_STATE_INDEX_AUTO+1)); signed idx = (mode - (ID_M_STATE_INDEX_AUTO+1));
settings->state_slot = idx; configuration_set_int(settings, settings->state_slot, idx);
} }
break; break;
} }