X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=2f734464c71f2e1b1ecf776047899b3d27b17d64;hp=8b51c06148c342f4526495c1008140ce93543cc7;hb=b094071f3a952169907415a7a8b38e9bdb2a4722;hpb=4c08b9e7dd350a48fc3e0515913d6ccc8b15e5ae

diff --git a/frontend/menu.c b/frontend/menu.c
index 8b51c061..2f734464 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -158,13 +158,8 @@ static void menu_sync_config(void)
 		allow_abs_only_old = in_evdev_allow_abs_only;
 	}
 
-	pl_frame_interval = Config.PsxType ? 20000 : 16667;
-	// used by P.E.Op.S. frameskip code
-	pl_rearmed_cbs.gpu_peops.fFrameRateHz = Config.PsxType ? 50.0f : 59.94f;
-	pl_rearmed_cbs.gpu_peops.dwFrameRateTicks =
-		(100000*100 / (unsigned long)(pl_rearmed_cbs.gpu_peops.fFrameRateHz*100));
-
 	iVolume = 768 + 128 * volume_boost;
+	pl_timing_prepare(Config.PsxType);
 }
 
 static void menu_set_defconfig(void)
@@ -183,6 +178,9 @@ static void menu_set_defconfig(void)
 	pl_rearmed_cbs.frameskip = 0;
 	pl_rearmed_cbs.gpu_peops.iUseDither = 0;
 	pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;
+	pl_rearmed_cbs.gpu_unai.abe_hack =
+	pl_rearmed_cbs.gpu_unai.no_light =
+	pl_rearmed_cbs.gpu_unai.no_blend = 0;
 
 	iUseReverb = 2;
 	iUseInterpolation = 1;
@@ -247,6 +245,9 @@ static const struct {
 	CE_INTVAL_P(frameskip),
 	CE_INTVAL_P(gpu_peops.iUseDither),
 	CE_INTVAL_P(gpu_peops.dwActFixes),
+	CE_INTVAL_P(gpu_unai.abe_hack),
+	CE_INTVAL_P(gpu_unai.no_light),
+	CE_INTVAL_P(gpu_unai.no_blend),
 	CE_INTVAL(iUseReverb),
 	CE_INTVAL(iXAPitch),
 	CE_INTVAL_V(iUseInterpolation, 2),
@@ -1077,6 +1078,21 @@ static int menu_loop_gfx_options(int id, int keys)
 
 // ------------ bios/plugins ------------
 
+static menu_entry e_menu_plugin_gpu_unai[] =
+{
+	mee_onoff     ("Abe's Odyssey hack",         0, pl_rearmed_cbs.gpu_unai.abe_hack, 1),
+	mee_onoff     ("Disable lighting",           0, pl_rearmed_cbs.gpu_unai.no_light, 1),
+	mee_onoff     ("Disable blending",           0, pl_rearmed_cbs.gpu_unai.no_blend, 1),
+	mee_end,
+};
+
+static int menu_loop_plugin_gpu_unai(int id, int keys)
+{
+	int sel = 0;
+	me_loop(e_menu_plugin_gpu_unai, &sel);
+	return 0;
+}
+
 static const char *men_gpu_dithering[] = { "None", "Game dependant", "Always", NULL };
 static const char h_gpu_0[]            = "Needed for Chrono Cross";
 static const char h_gpu_1[]            = "Capcom fighting games";
@@ -1088,7 +1104,7 @@ static const char h_gpu_8[]            = "Needed by Dark Forces";
 static const char h_gpu_9[]            = "better g-colors, worse textures";
 static const char h_gpu_10[]           = "Toggle busy flags after drawing";
 
-static menu_entry e_menu_plugin_gpu[] =
+static menu_entry e_menu_plugin_gpu_peops[] =
 {
 	mee_enum      ("Dithering",                  0, pl_rearmed_cbs.gpu_peops.iUseDither, men_gpu_dithering),
 	mee_onoff_h   ("Odd/even bit hack",          0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<0, h_gpu_0),
@@ -1103,10 +1119,10 @@ static menu_entry e_menu_plugin_gpu[] =
 	mee_end,
 };
 
-static int menu_loop_plugin_gpu(int id, int keys)
+static int menu_loop_plugin_gpu_peops(int id, int keys)
 {
 	static int sel = 0;
-	me_loop(e_menu_plugin_gpu, &sel);
+	me_loop(e_menu_plugin_gpu_peops, &sel);
 	return 0;
 }
 
@@ -1138,7 +1154,8 @@ static const char h_bios[]       = "HLE is simulated BIOS. BIOS selection is sav
 				   "the game for change to take effect";
 static const char h_plugin_xpu[] = "Must save config and reload the game\n"
 				   "for plugin change to take effect";
-static const char h_gpu[]        = "Configure P.E.Op.S. SoftGL Driver V1.17";
+static const char h_gpu_peops[]  = "Configure P.E.Op.S. SoftGL Driver V1.17";
+static const char h_gpu_unai[]   = "Configure Unai/PCSX4ALL Team GPU plugin";
 static const char h_spu[]        = "Configure built-in P.E.Op.S. Sound Driver V1.7";
 
 static menu_entry e_menu_plugin_options[] =
@@ -1146,7 +1163,8 @@ static menu_entry e_menu_plugin_options[] =
 	mee_enum_h    ("BIOS",                          0, bios_sel, bioses, h_bios),
 	mee_enum_h    ("GPU plugin",                    0, gpu_plugsel, gpu_plugins, h_plugin_xpu),
 	mee_enum_h    ("SPU plugin",                    0, spu_plugsel, spu_plugins, h_plugin_xpu),
-	mee_handler_h ("Configure gpu_peops plugin",    menu_loop_plugin_gpu, h_gpu),
+	mee_handler_h ("Configure gpu_peops plugin",    menu_loop_plugin_gpu_peops, h_gpu_peops),
+	mee_handler_h ("Configure PCSX4ALL GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai),
 	mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu),
 	mee_end,
 };
@@ -1494,7 +1512,7 @@ static int reset_game(void)
 
 static int reload_plugins(const char *cdimg)
 {
-	pl_fbdev_buf = NULL;
+	pl_vout_buf = NULL;
 
 	ClosePlugins();
 
@@ -1958,13 +1976,13 @@ static void menu_leave_emu(void)
 	}
 
 	memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
-	if (pl_fbdev_buf != NULL && ready_to_go && last_psx_bpp == 16) {
+	if (pl_vout_buf != NULL && ready_to_go && last_psx_bpp == 16) {
 		int x = max(0, g_menuscreen_w - last_psx_w);
 		int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2);
 		int w = min(g_menuscreen_w, last_psx_w);
 		int h = min(g_menuscreen_h, last_psx_h);
 		u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x;
-		u16 *s = pl_fbdev_buf;
+		u16 *s = pl_vout_buf;
 
 		for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w)
 			menu_darken_bg(d, s, w, 0);