X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro_core_options.h;h=3f589cc5acd8b0bbf6986dc1634de978926e4aa6;hb=82df580d6a00527fd55898b21a0d8e82b951620b;hp=1075e8f87b6a00d5407528328bf6ce62bdc865ab;hpb=accedc82b01fe5834a805a9872405d51de1d5c06;p=pcsx_rearmed.git

diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index 1075e8f8..3f589cc5 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -156,134 +156,9 @@ struct retro_core_option_definition option_defs_us[] = {
       },
       "1.00",
    },
-   {
-      "pcsx_rearmed_pad1type",
-      "Pad 1 Type",
-      "Pad type for player 1",
-      {
-         { "standard",  NULL },
-         { "analog",    NULL },
-         { "dualshock", NULL },
-         { "negcon",    NULL },
-         { "guncon",    NULL },
-         { "mouse",     NULL },
-         { "none",      NULL },
-         { NULL, NULL },
-      },
-      "standard",
-   },
-   {
-      "pcsx_rearmed_pad2type",
-      "Pad 2 Type",
-      "Pad type for player 2",
-      {
-         { "standard",  NULL },
-         { "analog",    NULL },
-         { "dualshock", NULL },
-         { "negcon",    NULL },
-         { "guncon",    NULL },
-         { "mouse",     NULL },
-         { "none",      NULL },
-         { NULL, NULL },
-      },
-      "standard",
-   },
-   {
-      "pcsx_rearmed_pad3type",
-      "Pad 3 Type",
-      "Pad type for player 3",
-      {
-         { "standard",  NULL },
-         { "analog",    NULL },
-         { "dualshock", NULL },
-         { "negcon",    NULL },
-         { "guncon",    NULL },
-         { "mouse",     NULL },
-         { "none",      NULL },
-         { NULL, NULL },
-      },
-      "none",
-   },
-   {
-      "pcsx_rearmed_pad4type",
-      "Pad 4 Type",
-      "Pad type for player 4",
-      {
-         { "standard",  NULL },
-         { "analog",    NULL },
-         { "dualshock", NULL },
-         { "negcon",    NULL },
-         { "guncon",    NULL },
-         { "mouse",     NULL },
-         { "none",      NULL },
-         { NULL, NULL },
-      },
-      "none",
-   },
-   {
-      "pcsx_rearmed_pad5type",
-      "Pad 5 Type",
-      "Pad type for player 5",
-      {
-         { "standard",  NULL },
-         { "analog",    NULL },
-         { "dualshock", NULL },
-         { "negcon",    NULL },
-         { "guncon",    NULL },
-         { "mouse",     NULL },
-         { "none",      NULL },
-         { NULL, NULL },
-      },
-      "none",
-   },{
-      "pcsx_rearmed_pad6type",
-      "Pad 6 Type",
-      "Pad type for player 6",
-      {
-         { "standard",  NULL },
-         { "analog",    NULL },
-         { "dualshock", NULL },
-         { "negcon",    NULL },
-         { "guncon",    NULL },
-         { "mouse",     NULL },
-         { "none",      NULL },
-         { NULL, NULL },
-      },
-      "none",
-   },{
-      "pcsx_rearmed_pad7type",
-      "Pad 7 Type",
-      "Pad type for player 7",
-      {
-         { "standard",  NULL },
-         { "analog",    NULL },
-         { "dualshock", NULL },
-         { "negcon",    NULL },
-         { "guncon",    NULL },
-         { "mouse",     NULL },
-         { "none",      NULL },
-         { NULL, NULL },
-      },
-      "none",
-   },{
-      "pcsx_rearmed_pad8type",
-      "Pad 8 Type",
-      "Pad type for player 8",
-      {
-         { "standard",  NULL },
-         { "analog",    NULL },
-         { "dualshock", NULL },
-         { "negcon",    NULL },
-         { "guncon",    NULL },
-         { "mouse",     NULL },
-         { "none",      NULL },
-         { NULL, NULL },
-      },
-      "none",
-   },
    {
       "pcsx_rearmed_multitap1",
-      "Multitap 1",
+      "Multitap 1 (Restart)",
       "Enables/Disables multitap on port 1, allowing upto 5 players in games that permit it.",
       {
          { "auto",     NULL },
@@ -295,7 +170,7 @@ struct retro_core_option_definition option_defs_us[] = {
    },
    {
       "pcsx_rearmed_multitap2",
-      "Multitap 2",
+      "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 },
@@ -972,6 +847,7 @@ struct retro_core_option_definition option_defs_us[] = {
       },
       "disabled",
    },
+#endif /* GPU UNAI Advanced Settings */
 #ifdef THREAD_RENDERING
    {
       "pcsx_rearmed_gpu_thread_rendering",
@@ -986,7 +862,6 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
 #endif
-#endif /* GPU UNAI Advanced Settings */
 
    {
       "pcsx_rearmed_show_bios_bootlogo",