X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmenu.c;h=e6c15402d7d0e435a8639b417a5765cd2e37c48b;hb=fb640dd9d9affafea31495762980117323636258;hp=6f74d4516586e1650b6141fbbe39a73f96c14f9c;hpb=0c2126b9446fea1eb2a4e4c84fcb5ac1f364e81c;p=pcsx_rearmed.git

diff --git a/frontend/menu.c b/frontend/menu.c
index 6f74d451..e6c15402 100644
--- 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;
-	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;
-	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) {
@@ -901,6 +903,7 @@ me_bind_action emuctrl_actions[] =
 	{ "Volume Up        ", 1 << SACTION_VOLUME_UP },
 	{ "Volume Down      ", 1 << SACTION_VOLUME_DOWN },
 #endif
+	{ "Analog toggle    ", 1 << SACTION_ANALOG_TOGGLE },
 	{ NULL,                0 }
 };
 
@@ -1217,6 +1220,7 @@ static const char *men_in_type_sel[] = {
 	"Standard (SCPH-1080)",
 	"Analog (SCPH-1150)",
 	"GunCon",
+	"Konami Gun",
 	"None",
 	NULL
 };