Max
/
SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rebase from master

This commit is contained in:
radius 2018-02-02 22:01:27 -05:00
parent ef143261e5
commit 120edb6f8c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libretro/libretro.c
View File

@ -43,9 +43,6 @@ enum model {
MODEL_AUTO
};
static enum model model = MODEL_AUTO;
static enum model auto_model = MODEL_CGB;
enum screen_layout {
LAYOUT_TOP_DOWN,
LAYOUT_LEFT_RIGHT
@ -57,6 +54,8 @@ enum audio_out {
};
static enum model model[2];
static enum model auto_model = MODEL_CGB;
static uint32_t *frame_buf = NULL;
static uint32_t *frame_buf_copy = NULL;
static struct retro_log_callback logging;
@ -206,9 +205,14 @@ static const struct retro_variable vars_link[] = {
static void init_for_current_model(void)
{
enum model effective_model = model;
if (effective_model == MODEL_AUTO) {
effective_model = auto_model;
unsigned i = 0;
enum model effective_model[2];
for (i=0; i < emulated_devices; i++)
{
effective_model[i] = model[i];
if (effective_model[i] == MODEL_AUTO) {
effective_model[i] = auto_model;
}
}
for (i = 0; i < emulated_devices; i++)