X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=8eb6c04363ed46b57f46ba137f63af93d22c2413;hp=20d334c1b3bfa38e802d2c7ad11e3f833da65300;hb=a33a15fd86c0afaaa52f1843c1e39d42f27861ab;hpb=1df403c52368a3930b67dedabf8c0e1d522f1cc3

diff --git a/frontend/menu.c b/frontend/menu.c
index 20d334c1..8eb6c043 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -20,10 +20,12 @@
 #include "plugin.h"
 #include "plugin_lib.h"
 #include "omap.h"
+#include "pcnt.h"
 #include "common/plat.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cdrom.h"
 #include "../libpcsxcore/psemu_plugin_defs.h"
+#include "../plugins/dfinput/pad.h"
 #include "revision.h"
 
 #define MENU_X2 1
@@ -414,7 +416,7 @@ fail:
 static unsigned short fname2color(const char *fname)
 {
 	static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" };
-	static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index" };
+	static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index", ".sbi" };
 	const char *ext = strrchr(fname, '.');
 	int i;
 
@@ -1203,8 +1205,9 @@ static void draw_frame_main(void)
 {
 	if (CdromId[0] != 0) {
 		char buff[64];
-		snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s)",
-			 get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC");
+		snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)",
+			 get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC",
+			 Config.HLE ? "HLE" : "BIOS");
 		smalltext_out16(4, 1, buff, 0x105f);
 	}
 }
@@ -1255,6 +1258,7 @@ static int run_bios(void)
 	ClosePlugins();
 	set_cd_image(NULL);
 	LoadPlugins();
+	pcnt_hook_plugins();
 	NetOpened = 0;
 	if (OpenPlugins() == -1) {
 		me_update_msg("failed to open plugins");
@@ -1279,6 +1283,7 @@ static int run_cd_image(const char *fname)
 	ClosePlugins();
 	set_cd_image(fname);
 	LoadPlugins();
+	pcnt_hook_plugins();
 	NetOpened = 0;
 	if (OpenPlugins() == -1) {
 		me_update_msg("failed to open plugins");
@@ -1670,6 +1675,8 @@ void menu_prepare_emu(void)
 		if (ret)
 			fprintf(stderr, "Warning: GPU_open returned %d\n", ret);
 	}
+
+	dfinput_activate(in_type == PSE_PAD_TYPE_ANALOGPAD);
 }
 
 void me_update_msg(const char *msg)