admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update core options to v2 format (add category support)

Browse Source
This commit is contained in:
jdgleaver
2021-10-19 17:33:56 +01:00
parent db2f0f7f9d
commit 0c82e4c73e
7 changed files with 1570 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/drivers/libretro/libretro_dipswitch.c
View File

@@ -1069,11 +1069,7 @@ enum {
DPSW_NWC,
};
static struct retro_core_option_definition option_defs_empty = {
NULL, NULL, NULL, { {0} }, NULL
};
static struct retro_core_option_definition vscoreopt[MAX_CORE_OPTIONS];
static struct retro_core_option_v2_definition vscoreopt[MAX_CORE_OPTIONS];
static VSUNIGAME *vsgame = NULL;
static char *core_key[MAX_CORE_OPTIONS];
@@ -1098,7 +1094,7 @@ static const char *str_to_corekey(char *s)
return str;
}
static void make_core_options(struct retro_core_option_definition *vs_core_options)
static void make_core_options(struct retro_core_option_v2_definition *vs_core_options)
{
unsigned i, j;
@@ -1109,6 +1105,9 @@ static void make_core_options(struct retro_core_option_definition *vs_core_optio
const char *option_name = vsgame->core_options[i].option_name;
char key[100] = {0};
memset(&vs_core_options[i], 0,
sizeof(struct retro_core_option_v2_definition));
/* Set core key and sanitize string */
sprintf(key, "fceumm_dipswitch_%s-%s", game_name, option_name);
core_key[i] = calloc(strlen(key) + 1, sizeof(char));
@@ -1118,8 +1117,8 @@ static void make_core_options(struct retro_core_option_definition *vs_core_optio
/* Set desc */
vs_core_options[i].desc = option_name;
/* Set info */
vs_core_options[i].info = NULL;
/* Set category_key */
vs_core_options[i].category_key = "dip_switch";
/* Set core values */
for (j = 0; j < numValues[i]; j++) {
@@ -1127,8 +1126,6 @@ static void make_core_options(struct retro_core_option_definition *vs_core_optio
vs_core_options[i].values[j].value = var_value;
}
vs_core_options[i].values[j] = vars_empty;
/* Set default value. Top entry used as default */
vs_core_options[i].default_value = vsgame->core_options[i].settings[0].name;
}
@@ -1241,11 +1238,14 @@ static void update_dipswitch_vsuni(void)
}
/* Nintendo World Championships 1990 */
static struct retro_core_option_definition dipswitch_nwc[] = {
static struct retro_core_option_v2_definition dipswitch_nwc[] = {
{
"fceumm_dipswitch_nwc",
"Gameplay Duration in minutes (Restart)",
NULL,
"Sets the game timer in minutes.",
NULL,
"dip_switch",
{
{ "0", "5:00" },
{ "1", "5:19" },
@@ -1263,12 +1263,11 @@ static struct retro_core_option_definition dipswitch_nwc[] = {
{ "13", "9:04" },
{ "14", "9:23" },
{ "15", "9:42" },
{ NULL, NULL},
{ NULL, NULL },
},
"4",
},
{ NULL, NULL, NULL, { {0} }, NULL },
{ NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
};
static void update_dipswitch_nwc(void)
@@ -1292,7 +1291,7 @@ static void update_dipswitch_nwc(void)
}
}
size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_definition *vars)
void set_dipswitch_variables(unsigned current_index, struct retro_core_option_v2_definition *vars)
{
unsigned index = current_index;
int dipsw_size = 0;
@@ -1310,8 +1309,7 @@ size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_
dipswitch_type = DPSW_VSUNI;
/* Initialize dipswitch struct with empty values */
for (i = 0; i < MAX_CORE_OPTIONS; i++)
vscoreopt[i] = option_defs_empty;
memset(&vscoreopt, 0, sizeof(vscoreopt));
/* Count number of core options and the number of values for each */
for (i = 0; i < MAX_CORE_OPTIONS; i++) {
@@ -1328,12 +1326,13 @@ size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_
/* Append dipswitch struct to main core options struct */
while (vscoreopt[dipsw_size].key) {
vars[index] = vscoreopt[dipsw_size];
memcpy(&vars[index], &vscoreopt[dipsw_size],
sizeof(struct retro_core_option_v2_definition));
index++;
dipsw_size++;
}
}
return (dipsw_size);
return;
}
/* Nintendo World Championship cart (Mapper 105)*/
@@ -1342,15 +1341,16 @@ size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_
dipswitch_type = DPSW_NWC;
while (dipswitch_nwc[dipsw_size].key) {
vars[index] = dipswitch_nwc[dipsw_size];
memcpy(&vars[index], &dipswitch_nwc[dipsw_size],
sizeof(struct retro_core_option_v2_definition));
index++;
dipsw_size++;
}
return (dipsw_size);
return;
}
dipswitch_type = DPSW_NONE;
return (0);
return;
}
void update_dipswitch(void)