X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=59f1201509e764822c59b5ba5510880cbf9712fd;hb=c2d67cd94f604bbf4fc8aaf3a5da3275d1b733a6;hp=5c966a4ffe333fb6e2f59380cd10f219b9adfdcd;hpb=1d2757f476f5c10229e10fa16107d73b0c801fa5;p=pcsx_rearmed.git

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 5c966a4f..59f12015 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",
@@ -2682,6 +2680,7 @@ static void loadPSXBios(void)
    unsigned useHLE = 0;
 
    const char *bios[] = {
+      "PS1_ROM", "ps1_rom",
       "PSXONPSP660", "psxonpsp660",
       "SCPH101", "scph101",
       "SCPH5501", "scph5501",
@@ -2726,11 +2725,19 @@ static void loadPSXBios(void)
       }
    }
 
-   if (useHLE || !found_bios)
+   if (!found_bios)
    {
-      const char *msg_str = "No PlayStation BIOS file found - add for better compatibility";
-
-      SysPrintf("no BIOS files found.\n");
+      const char *msg_str;
+      if (useHLE)
+      {
+         msg_str = "BIOS set to \'hle\' in core options - real BIOS will be ignored";
+         SysPrintf("Using HLE BIOS.\n");
+      }
+      else
+      {
+         msg_str = "No PlayStation BIOS file found - add for better compatibility";
+         SysPrintf("No BIOS files found.\n");
+      }
 
       if (msg_interface_version >= 1)
       {