This commit is contained in:
twinaphex 2016-05-08 04:16:11 +02:00
parent 1968b0a333
commit 496fcc9798
2 changed files with 10 additions and 8 deletions

View File

@ -28,6 +28,7 @@
#include "record/record_driver.h"
#include "autosave.h"
#include "core_info.h"
#include "core_type.h"
#include "cheats.h"
#include "performance.h"
#include "dynamic.h"
@ -576,12 +577,12 @@ static bool event_init_content(void)
return true;
}
static bool event_init_core(void *data)
static bool event_init_core(enum rarch_core_type *data)
{
retro_ctx_environ_info_t info;
settings_t *settings = config_get_ptr();
if (!core_init_symbols((rarch_core_type*)data))
if (!core_init_symbols(data))
return false;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_INIT, NULL);
@ -1328,7 +1329,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
break;
}
case EVENT_CMD_CORE_INIT:
if (!event_init_core(data))
if (!event_init_core((enum rarch_core_type*)data))
return false;
break;
case EVENT_CMD_VIDEO_APPLY_STATE_CHANGES:

View File

@ -90,6 +90,12 @@ struct sram_block
size_t size;
};
static const struct file_archive_file_backend *stream_backend = NULL;
static struct string_list *temporary_content = NULL;
static bool content_is_inited = false;
static bool core_does_not_need_content = false;
static uint32_t content_crc = 0;
#ifdef HAVE_COMPRESSION
#ifdef HAVE_7ZIP
@ -1696,11 +1702,6 @@ static bool content_file_free(struct string_list *temporary_content)
bool content_ctl(enum content_ctl_state state, void *data)
{
static const struct file_archive_file_backend *stream_backend = NULL;
static struct string_list *temporary_content = NULL;
static bool content_is_inited = false;
static bool core_does_not_need_content = false;
static uint32_t content_crc = 0;
switch(state)
{