aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornegativeExponent2021-02-11 16:48:08 +0800
committernegativeExponent2021-02-11 16:48:15 +0800
commit5f948beb799e227ea23319c87bf6dbd11f24ab38 (patch)
tree4111972f61dabac8d9bb05652444220a16aae13e
parent976907a40062e6e9bb6a05530259132fe1c2a90e (diff)
downloadpcsx_rearmed-5f948beb799e227ea23319c87bf6dbd11f24ab38.tar.gz
pcsx_rearmed-5f948beb799e227ea23319c87bf6dbd11f24ab38.tar.bz2
pcsx_rearmed-5f948beb799e227ea23319c87bf6dbd11f24ab38.zip
Set multitap options disabled by default, prevent previous defaults from being accidentally loaded instead.
-rw-r--r--frontend/libretro.c8
-rw-r--r--frontend/libretro_core_options.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c
index f93e33a..d312e42 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)
{
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 },