X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmenu.c;h=0ca76d91402fce8a5c3cfbf572b5942a2e29eb04;hb=ecfeb56f01924968a87128c515a4244999fc7d69;hp=c8f34fe81b87ee7ddcc586b15de4ca5aae5d8c32;hpb=993920ef01cd43bcfe0968ff78af1ea512107cc0;p=pcsx_rearmed.git diff --git a/frontend/menu.c b/frontend/menu.c index c8f34fe8..0ca76d91 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -36,7 +36,6 @@ #include "../libpcsxcore/cdriso.h" #include "../libpcsxcore/cheat.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" -#include "../plugins/dfinput/externals.h" #include "../plugins/dfsound/spu_config.h" #include "psemu_plugin_defs.h" #include "arm_features.h" @@ -313,11 +312,13 @@ static void menu_sync_config(void) 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; 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; default: in_type[1] = PSE_PAD_TYPE_STANDARD; } if (in_evdev_allow_abs_only != allow_abs_only_old) { @@ -1206,6 +1207,7 @@ static const char *men_in_type_sel[] = { "Standard (SCPH-1080)", "Analog (SCPH-1150)", "GunCon", + "None", NULL }; static const char h_nub_btns[] = "Experimental, keep this OFF if unsure. Select rescan after change."; @@ -2700,8 +2702,6 @@ void menu_prepare_emu(void) if (ret) fprintf(stderr, "Warning: GPU_open returned %d\n", ret); } - - dfinput_activate(); } void menu_update_msg(const char *msg)