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
gpu_neon: unbreak sprites in enhanced res
[pcsx_rearmed.git]
/
frontend
/
menu.c
diff --git
a/frontend/menu.c
b/frontend/menu.c
index
6705b63
..
e6c1540
100644
(file)
--- a/
frontend/menu.c
+++ b/
frontend/menu.c
@@
-316,14
+316,16
@@
static void menu_sync_config(void)
switch (in_type_sel1) {
case 1: in_type[0] = PSE_PAD_TYPE_ANALOGPAD; break;
switch (in_type_sel1) {
case 1: in_type[0] = PSE_PAD_TYPE_ANALOGPAD; break;
- case 2: in_type[0] = PSE_PAD_TYPE_NEGCON; break;
- case 3: in_type[0] = PSE_PAD_TYPE_NONE; break;
+ case 2: in_type[0] = PSE_PAD_TYPE_GUNCON; break;
+ case 3: in_type[0] = PSE_PAD_TYPE_GUN; break;
+ case 4: in_type[0] = PSE_PAD_TYPE_NONE; break;
default: in_type[0] = PSE_PAD_TYPE_STANDARD;
}
switch (in_type_sel2) {
case 1: in_type[1] = PSE_PAD_TYPE_ANALOGPAD; break;
default: in_type[0] = PSE_PAD_TYPE_STANDARD;
}
switch (in_type_sel2) {
case 1: in_type[1] = PSE_PAD_TYPE_ANALOGPAD; break;
- case 2: in_type[1] = PSE_PAD_TYPE_NEGCON; break;
- case 3: in_type[1] = PSE_PAD_TYPE_NONE; break;
+ case 2: in_type[1] = PSE_PAD_TYPE_GUNCON; break;
+ case 3: in_type[1] = PSE_PAD_TYPE_GUN; break;
+ case 4: in_type[1] = PSE_PAD_TYPE_NONE; break;
default: in_type[1] = PSE_PAD_TYPE_STANDARD;
}
if (in_evdev_allow_abs_only != allow_abs_only_old) {
default: in_type[1] = PSE_PAD_TYPE_STANDARD;
}
if (in_evdev_allow_abs_only != allow_abs_only_old) {
@@
-901,6
+903,7
@@
me_bind_action emuctrl_actions[] =
{ "Volume Up ", 1 << SACTION_VOLUME_UP },
{ "Volume Down ", 1 << SACTION_VOLUME_DOWN },
#endif
{ "Volume Up ", 1 << SACTION_VOLUME_UP },
{ "Volume Down ", 1 << SACTION_VOLUME_DOWN },
#endif
+ { "Analog toggle ", 1 << SACTION_ANALOG_TOGGLE },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-1217,6
+1220,7
@@
static const char *men_in_type_sel[] = {
"Standard (SCPH-1080)",
"Analog (SCPH-1150)",
"GunCon",
"Standard (SCPH-1080)",
"Analog (SCPH-1150)",
"GunCon",
+ "Konami Gun",
"None",
NULL
};
"None",
NULL
};
@@
-1720,6
+1724,7
@@
static const char h_confirm_save[] = "Ask for confirmation when overwriting s
static const char h_restore_def[] = "Switches back to default / recommended\n"
"configuration";
static const char h_frameskip[] = "Warning: frameskip sometimes causes glitches\n";
static const char h_restore_def[] = "Switches back to default / recommended\n"
"configuration";
static const char h_frameskip[] = "Warning: frameskip sometimes causes glitches\n";
+static const char h_sputhr[] = "Warning: has some known bugs\n";
static menu_entry e_menu_options[] =
{
static menu_entry e_menu_options[] =
{
@@
-1730,9
+1735,9
@@
static menu_entry e_menu_options[] =
mee_enum ("Region", 0, region, men_region),
mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
#ifdef C64X_DSP
mee_enum ("Region", 0, region, men_region),
mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
#ifdef C64X_DSP
- mee_onoff
("Use C64x DSP for sound", MA_OPT_SPU_THREAD, spu_config.iUseThread, 1
),
+ mee_onoff
_h ("Use C64x DSP for sound", MA_OPT_SPU_THREAD, spu_config.iUseThread, 1, h_sputhr
),
#else
#else
- mee_onoff
("Threaded SPU", MA_OPT_SPU_THREAD, spu_config.iUseThread, 1
),
+ mee_onoff
_h ("Threaded SPU", MA_OPT_SPU_THREAD, spu_config.iUseThread, 1, h_sputhr
),
#endif
mee_handler_id("[Display]", MA_OPT_DISP_OPTS, menu_loop_gfx_options),
mee_handler ("[BIOS/Plugins]", menu_loop_plugin_options),
#endif
mee_handler_id("[Display]", MA_OPT_DISP_OPTS, menu_loop_gfx_options),
mee_handler ("[BIOS/Plugins]", menu_loop_plugin_options),