aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--frontend/libretro.c10
-rw-r--r--frontend/libretro_core_options.h4
2 files changed, 6 insertions, 8 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c
index f93e33a..91721af 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -589,11 +589,11 @@ static void update_multitap(void)
multitap1 = 1;
else if (strcmp(var.value, "disabled") == 0)
multitap1 = 0;
- else // 'auto' case
+ else if (strcmp(var.value, "automatic") == 0)
auto_case = 1;
}
else
- auto_case = 1;
+ multitap1 = 0;
if (auto_case)
{
@@ -612,11 +612,11 @@ static void update_multitap(void)
multitap2 = 1;
else if (strcmp(var.value, "disabled") == 0)
multitap2 = 0;
- else // 'auto' case
+ else if (strcmp(var.value, "automatic") == 0)
auto_case = 1;
}
else
- auto_case = 1;
+ multitap2 = 0;
if (auto_case)
{
@@ -2132,8 +2132,6 @@ static void update_variables(bool in_flight)
unsigned i;
struct retro_core_option_display option_display;
char gpu_peops_option[][50] = {
- "pcsx_rearmed_multitap1",
- "pcsx_rearmed_multitap2",
"pcsx_rearmed_negcon_deadzone",
"pcsx_rearmed_negcon_response",
"pcsx_rearmed_analog_axis_modifier",
diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index ca61b27..cf89605 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -161,7 +161,7 @@ struct retro_core_option_definition option_defs_us[] = {
"Multitap 1 (Restart)",
"Enables/Disables multitap on port 1, allowing upto 5 players in games that permit it.",
{
- { "auto", NULL },
+ { "automatic", NULL },
{ "disabled", NULL },
{ "enabled", NULL },
{ NULL, NULL },
@@ -173,7 +173,7 @@ struct retro_core_option_definition option_defs_us[] = {
"Multitap 2 (Restart)",
"Enables/Disables multitap on port 2, allowing up to 8 players in games that permit it. Multitap 1 has to be enabled for this to work.",
{
- { "auto", NULL },
+ { "automatic", NULL },
{ "disabled", NULL },
{ "enabled", NULL },
{ NULL, NULL },