From 6cb1dcb1f49337ba124e9243ed93da1566dad773 Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Sun, 16 May 2021 12:30:42 +0800 Subject: [PATCH] Update multitap option description --- frontend/libretro.c | 27 +++++++-------------------- frontend/libretro_core_options.h | 10 +++++----- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/frontend/libretro.c b/frontend/libretro.c index e9567de6..5fbabdab 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -592,37 +592,24 @@ unsigned retro_api_version(void) static void update_multitap(void) { - struct retro_variable var = {}; + struct retro_variable var = { 0 }; + + multitap1 = 0; + multitap2 = 0; var.value = NULL; var.key = "pcsx_rearmed_multitap"; if (environ_cb && (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)) { - if (strcmp(var.value, "port 1 only") == 0) - { + if (strcmp(var.value, "port 1") == 0) multitap1 = 1; - multitap2 = 0; - } - else if (strcmp(var.value, "port 2 only") == 0) - { - multitap1 = 0; + else if (strcmp(var.value, "port 2") == 0) multitap2 = 1; - } - else if (strcmp(var.value, "both") == 0) + else if (strcmp(var.value, "ports 1 and 2") == 0) { multitap1 = 1; multitap2 = 1; } - else - { - multitap1 = 0; - multitap2 = 0; - } - } - else - { - multitap1 = 0; - multitap2 = 0; } } diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h index e16246ff..813e30ab 100644 --- a/frontend/libretro_core_options.h +++ b/frontend/libretro_core_options.h @@ -159,12 +159,12 @@ struct retro_core_option_definition option_defs_us[] = { { "pcsx_rearmed_multitap", "Multitap Mode (Restart)", - "Enables/Disables multitap on port 1 and/or port 2, allowing upto 5 players in games that permit it.", + "Sets the playstation multitap peripheral to either controller port 1 or controller port 2 to support of upto 5 players simultaneously, or on both for upto 8 players simultaneously. Option depends on games that has support for multitap feature. Leave option on disabled if not such compatible games to avoid any input-related problems.", { - { "disable", NULL }, - { "port 1 only", NULL }, - { "port 2 only", NULL }, - { "both", NULL }, + { "disabled", NULL }, + { "port 1", NULL }, + { "port 2", NULL }, + { "ports 1 and 2", NULL }, { NULL, NULL }, }, "disabled", -- 2.39.5