mirror of
https://github.com/libretro/RetroArch
synced 2025-04-10 06:44:27 +00:00
Cleanups
This commit is contained in:
parent
ddc3959e42
commit
73e97d119d
17
content.c
17
content.c
@ -630,7 +630,7 @@ static bool init_content_file_extract(
|
||||
}
|
||||
#endif
|
||||
|
||||
static void init_content_file_set_attribs(
|
||||
static bool init_content_file_set_attribs(
|
||||
struct string_list *content,
|
||||
rarch_system_info_t *system,
|
||||
const struct retro_subsystem_info *special,
|
||||
@ -648,6 +648,7 @@ static void init_content_file_set_attribs(
|
||||
attr->i = special->roms[i].block_extract;
|
||||
attr->i |= special->roms[i].need_fullpath << 1;
|
||||
attr->i |= special->roms[i].required << 2;
|
||||
|
||||
string_list_append(content,
|
||||
global->subsystem_fullpaths->elems[i].data, *attr);
|
||||
}
|
||||
@ -671,6 +672,13 @@ static void init_content_file_set_attribs(
|
||||
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)
|
||||
goto error;
|
||||
|
||||
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))
|
||||
if (!init_content_file_set_attribs(content, system, special, &attr))
|
||||
goto error;
|
||||
#endif
|
||||
|
||||
info = (struct retro_game_info*)
|
||||
calloc(content->size, sizeof(*info));
|
||||
|
Loading…
x
Reference in New Issue
Block a user