CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-09 20:41:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2344 from leiradel/master

Browse Source 
fix cheevos_fill_md5; better way to check if the core supports cheevos
This commit is contained in:
Twinaphex 2015-11-04 10:28:02 +01:00
commit 701bc33450
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cheevos.c
View File

@ -309,10 +309,11 @@ static int cheevos_get_value(const char *json, unsigned key_hash, char *value, s
ud.key_hash = key_hash;
ud.is_key = 0;
ud.value = NULL;
ud.length = 0;
*value = 0;
if (jsonsax_parse(json, &handlers, (void*)&ud) == JSONSAX_OK && ud.length < length)
if (jsonsax_parse(json, &handlers, (void*)&ud) == JSONSAX_OK && ud.value && ud.length < length)
{
strncpy(value, ud.value, length);
value[ud.length] = 0;
@ -882,7 +883,7 @@ Test all the achievements (call once per frame).
static const uint8_t *cheevos_get_memory(unsigned offset)
{
size_t size = core.retro_get_memory_size( RETRO_MEMORY_SYSTEM_RAM );
size_t size = core.retro_get_memory_size(RETRO_MEMORY_SYSTEM_RAM);
uint8_t *memory;
if (offset < size)
@ -1563,7 +1564,7 @@ static void cheevos_fill_md5(size_t size, size_t total, MD5_CTX *ctx)
memset((void*)buffer, 0, sizeof(buffer));
do
while (fill > 0)
{
ssize_t len = sizeof(buffer);
@ -1573,7 +1574,6 @@ static void cheevos_fill_md5(size_t size, size_t total, MD5_CTX *ctx)
MD5_Update(ctx, (void*)buffer, len);
fill -= len;
}
while (fill > 0);
}
typedef unsigned (*cheevos_id_finder_t)(const struct retro_game_info *, retro_time_t);
@ -1750,6 +1750,7 @@ int cheevos_load(const struct retro_game_info *info)
retro_time_t timeout = 5000000;
unsigned game_id = 0;
size_t memory;
int i;
const char *json;
@ -1759,7 +1760,12 @@ int cheevos_load(const struct retro_game_info *info)
if (!config_get_ptr()->cheevos.enable)
return 0;
if (!cheevos_get_memory(0))
memory = core.retro_get_memory_size(RETRO_MEMORY_SYSTEM_RAM);
memory += core.retro_get_memory_size(RETRO_MEMORY_VIDEO_RAM);
memory += core.retro_get_memory_size(RETRO_MEMORY_RTC);
memory += core.retro_get_memory_size(RETRO_MEMORY_SAVE_RAM);
if (!memory)
{
rarch_main_msg_queue_push("This core doesn't support achievements", 0, 5 * 60, false);
return -1;