ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move attr variable to init_content_file_set_attribs

This commit is contained in:
twinaphex 2016-01-19 17:33:06 +01:00
parent 73e97d119d
commit 7405535f03
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
content.c
View File

@ -633,11 +633,12 @@ static bool init_content_file_extract(
static bool 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,37 +646,37 @@ static bool 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);
} }
} }
else else
{ {
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 #ifdef HAVE_ZLIB
/* Try to extract all content we're going to load if appropriate. */ /* 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_extract(content, system, special, &attr))
return false; return false;
#endif #endif
return true; return true;
@ -695,7 +696,6 @@ static bool init_content_file_set_attribs(
bool init_content_file(void) bool init_content_file(void)
{ {
unsigned i; unsigned i;
union string_list_elem_attr attr;
struct retro_game_info *info = NULL; struct retro_game_info *info = NULL;
bool ret = false; bool ret = false;
struct string_list* additional_path_allocs = NULL; struct string_list* additional_path_allocs = NULL;
@ -717,7 +717,7 @@ bool init_content_file(void)
if (!content) if (!content)
goto error; goto error;
if (!init_content_file_set_attribs(content, system, special, &attr)) if (!init_content_file_set_attribs(content, system, special))
goto error; goto error;
info = (struct retro_game_info*) info = (struct retro_game_info*)