From 2c28505e04a6e42a7b9733f09c6cf82fae2c2057 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 6 May 2017 05:13:17 +0200
Subject: [PATCH] Refactor cheevos_load
---
cheevos/cheevos.c | 8 +++-----
cheevos/cheevos.h | 4 +++-
tasks/task_content.c | 7 ++++---
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index 58982f9bec..1fcf0ca293 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -2944,7 +2944,7 @@ static unsigned cheevos_find_game_id_nes(
return cheevos_get_game_id(hash, &timeout);
}
-bool cheevos_load(const void *data)
+bool cheevos_load(bool cheevos_enable, const struct retro_game_info *info)
{
static const uint32_t genesis_exts[] =
{
@@ -2988,15 +2988,13 @@ bool cheevos_load(const void *data)
const char *json = NULL;
retro_time_t timeout = 5000000;
unsigned game_id = 0;
- settings_t *settings = config_get_ptr();
- const struct retro_game_info *info = (const struct retro_game_info*)data;
url[0] = '\0';
cheevos_loaded = 0;
/* Just return OK if the core doesn't support cheevos, or info is NULL. */
- if (!cheevos_locals.core_supports || !info)
+ if (!cheevos_locals.core_supports)
return true;
cheevos_locals.meminfo[0].id = RETRO_MEMORY_SYSTEM_RAM;
@@ -3024,7 +3022,7 @@ bool cheevos_load(const void *data)
/* Bail out if cheevos are disabled.
* But set the above anyways, command_read_ram needs it. */
- if (!settings->bools.cheevos_enable)
+ if (!cheevos_enable)
return true;
/* Use the supported extensions as a hint
diff --git a/cheevos/cheevos.h b/cheevos/cheevos.h
index 6594105ac3..6282d9da8b 100644
--- a/cheevos/cheevos.h
+++ b/cheevos/cheevos.h
@@ -20,6 +20,8 @@
#include <stdlib.h>
#include <retro_common_api.h>
+#include <boolean.h>
+#include <libretro.h>
RETRO_BEGIN_DECLS
@@ -39,7 +41,7 @@ typedef struct
unsigned previous;
} cheevos_var_t;
-bool cheevos_load(const void *data);
+bool cheevos_load(bool cheevos_enable, const struct retro_game_info *info);
void cheevos_reset_game(void);
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 67db2a7af7..d8414e887c 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -591,14 +591,15 @@ static bool content_file_load(
#ifdef HAVE_CHEEVOS
if (!special)
{
- const void *load_data = NULL;
const char *path = content->elems[0].data;
cheevos_set_cheats();
if (!string_is_empty(path))
- load_data = info;
- cheevos_load(load_data);
+ {
+ settings_t *settings = config_get_ptr();
+ cheevos_load(settings->bools.cheevos_enable, info);
+ }
}
#endif