mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

address travis warnings

Browse Source
This commit is contained in:
Jamiras 2020-08-11 10:21:10 -06:00
parent b15411dad8
commit 0609d229a6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cheevos/memory.c
View File

@ -102,21 +102,21 @@ static void rcheevos_memory_init_without_regions(rcheevos_memory_regions_t* regi
meminfo.id = RETRO_MEMORY_SYSTEM_RAM; meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
core_get_memory(&meminfo); core_get_memory(&meminfo);
rcheevos_memory_register_region(regions, RC_MEMORY_TYPE_SYSTEM_RAM, meminfo.data, meminfo.size, description); rcheevos_memory_register_region(regions, RC_MEMORY_TYPE_SYSTEM_RAM, (uint8_t*)meminfo.data, meminfo.size, description);
meminfo.id = RETRO_MEMORY_SAVE_RAM; meminfo.id = RETRO_MEMORY_SAVE_RAM;
core_get_memory(&meminfo); core_get_memory(&meminfo);
rcheevos_memory_register_region(regions, RC_MEMORY_TYPE_SAVE_RAM, meminfo.data, meminfo.size, description); rcheevos_memory_register_region(regions, RC_MEMORY_TYPE_SAVE_RAM, (uint8_t*)meminfo.data, meminfo.size, description);
} }
static const rarch_memory_descriptor_t* rcheevos_memory_get_descriptor(const rarch_memory_map_t* mmap, unsigned real_address) static const rarch_memory_descriptor_t* rcheevos_memory_get_descriptor(const rarch_memory_map_t* mmap, unsigned real_address)
{ {
if (mmap->num_descriptors == 0)
return NULL;
const rarch_memory_descriptor_t* desc = mmap->descriptors; const rarch_memory_descriptor_t* desc = mmap->descriptors;
const rarch_memory_descriptor_t* end = desc + mmap->num_descriptors; const rarch_memory_descriptor_t* end = desc + mmap->num_descriptors;
if (mmap->num_descriptors == 0)
return NULL;
for (; desc < end; desc++) for (; desc < end; desc++)
{ {
if (desc->core.select == 0) if (desc->core.select == 0)
@ -284,13 +284,13 @@ static void rcheevos_memory_init_from_unmapped_memory(rcheevos_memory_regions_t*
if (console_region_size > meminfo.size) if (console_region_size > meminfo.size)
{ {
/* want more than what is available, take what we can and null fill the rest */ /* want more than what is available, take what we can and null fill the rest */
rcheevos_memory_register_region(regions, console_region->type, meminfo.data, meminfo.size, description); rcheevos_memory_register_region(regions, console_region->type, (uint8_t*)meminfo.data, meminfo.size, description);
rcheevos_memory_register_region(regions, console_region->type, NULL, console_region_size - meminfo.size, "null filler"); rcheevos_memory_register_region(regions, console_region->type, NULL, console_region_size - meminfo.size, "null filler");
} }
else else
{ {
/* only take as much as we need */ /* only take as much as we need */
rcheevos_memory_register_region(regions, console_region->type, meminfo.data, console_region_size, description); rcheevos_memory_register_region(regions, console_region->type, (uint8_t*)meminfo.data, console_region_size, description);
} }
} }
} }