notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not hide multitap core options
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
5c966a4
..
91721af
100644
(file)
--- 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;
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;
}
else
-
auto_case = 1
;
+
multitap1 = 0
;
if (auto_case)
{
if (auto_case)
{
@@
-612,11
+612,11
@@
static void update_multitap(void)
multitap2 = 1;
else if (strcmp(var.value, "disabled") == 0)
multitap2 = 0;
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;
}
else
-
auto_case = 1
;
+
multitap2 = 0
;
if (auto_case)
{
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] = {
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",
"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[] = {
unsigned useHLE = 0;
const char *bios[] = {
+ "PS1_ROM", "ps1_rom",
"PSXONPSP660", "psxonpsp660",
"SCPH101", "scph101",
"SCPH5501", "scph5501",
"PSXONPSP660", "psxonpsp660",
"SCPH101", "scph101",
"SCPH5501", "scph5501",