mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-01-19 17:29:25 +01:00
parent ddc3959e42
commit 73e97d119d
1 changed files with 19 additions and 16 deletions

35
content.c

@ -630,14 +630,14 @@ static bool init_content_file_extract(
} }
#endif #endif
static void init_content_file_set_attribs( static bool init_content_file_set_attribs(
struct string_list *content, struct string_list *content,
rarch_system_info_t *system, rarch_system_info_t *system,
const struct retro_subsystem_info *special, const struct retro_subsystem_info *special,
union string_list_elem_attr *attr) union string_list_elem_attr *attr)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
attr->i = 0; attr->i = 0;
if (*global->subsystem) if (*global->subsystem)
{ {
@ -645,9 +645,10 @@ static void init_content_file_set_attribs(
for (i = 0; i < global->subsystem_fullpaths->size; i++) for (i = 0; i < global->subsystem_fullpaths->size; i++)
{ {
attr->i = special->roms[i].block_extract; attr->i = special->roms[i].block_extract;
attr->i |= special->roms[i].need_fullpath << 1; attr->i |= special->roms[i].need_fullpath << 1;
attr->i |= special->roms[i].required << 2; attr->i |= special->roms[i].required << 2;
string_list_append(content, string_list_append(content,
global->subsystem_fullpaths->elems[i].data, *attr); global->subsystem_fullpaths->elems[i].data, *attr);
} }
@ -656,21 +657,28 @@ static void init_content_file_set_attribs(
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
attr->i = system->info.block_extract; attr->i = system->info.block_extract;
attr->i |= system->info.need_fullpath << 1; attr->i |= system->info.need_fullpath << 1;
attr->i |= (!system->no_content) << 2; attr->i |= (!system->no_content) << 2;
if (global->inited.core.no_content if (global->inited.core.no_content
&& settings->core.set_supports_no_game_enable) && settings->core.set_supports_no_game_enable)
string_list_append(content, "", *attr); string_list_append(content, "", *attr);
else else
{ {
char *fullpath = NULL; char *fullpath = NULL;
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
string_list_append(content, fullpath, *attr); string_list_append(content, fullpath, *attr);
} }
} }
#ifdef HAVE_ZLIB
/* Try to extract all content we're going to load if appropriate. */
if (!init_content_file_extract(content, system, special, attr))
return false;
#endif
return true;
} }
/** /**
@ -709,13 +717,8 @@ bool init_content_file(void)
if (!content) if (!content)
goto error; goto error;
init_content_file_set_attribs(content, system, special, &attr); if (!init_content_file_set_attribs(content, system, special, &attr))
#ifdef HAVE_ZLIB
/* Try to extract all content we're going to load if appropriate. */
if (!init_content_file_extract(content, system, special, &attr))
goto error; goto error;
#endif
info = (struct retro_game_info*) info = (struct retro_game_info*)
calloc(content->size, sizeof(*info)); calloc(content->size, sizeof(*info));