X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=b5c349535a3a4fad98a16aa1d5b64bd5dd214f36;hb=fa8d133192876a802fbac43c0a0bfe4f5f85b682;hp=0b49234bfd7a79a9b549e3ebe5f8364676c1bbc5;hpb=d572cbad9886a04f8c51edb825dc6aaec9b02e23;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index 0b49234..b5c3495 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -1415,15 +1415,6 @@ static int menu_loop_cd_options(menu_id id, int keys)
 
 // ------------ adv options menu ------------
 
-// TODO FIXME fix if and mv
-static const char *mgn_aopt_sqhack(menu_id id, int *offs)
-{
-	*offs = -10;
-	sprintf(static_buff, "%s, %s", 111 ? "  active" : "inactive",
-		(currentConfig.EmuOpt & 0x10) ? "ON" : "OFF");
-	return static_buff;
-}
-
 static menu_entry e_menu_adv_options[] =
 {
 	mee_onoff     ("SRAM/BRAM saves",          MA_OPT_SRAM_STATES,    currentConfig.EmuOpt, EOPT_USE_SRAM),
@@ -1434,9 +1425,8 @@ static menu_entry e_menu_adv_options[] =
 	mee_onoff     ("Emulate SN76496 (PSG)",    MA_OPT2_ENABLE_SN76496,PicoOpt, POPT_EN_PSG),
 	mee_onoff     ("gzip savestates",          MA_OPT2_GZIP_STATES,   currentConfig.EmuOpt, EOPT_GZIP_SAVES),
 	mee_onoff     ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM,   currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),
-	mee_label     ("- needs restart -"),
-	mee_onoff     ("craigix's RAM timings",    MA_OPT2_RAMTIMINGS,    currentConfig.EmuOpt, 0x0100),
-	mee_onoff_cust("Squidgehack",              MA_OPT2_SQUIDGEHACK,   currentConfig.EmuOpt, 0x0010, mgn_aopt_sqhack),
+	mee_onoff     ("RAM overclock",            MA_OPT2_RAMTIMINGS,    currentConfig.EmuOpt, EOPT_RAM_TIMINGS),
+	mee_onoff     ("MMU hack",                 MA_OPT2_SQUIDGEHACK,   currentConfig.EmuOpt, EOPT_MMUHACK),
 	mee_onoff     ("SVP dynarec",              MA_OPT2_SVP_DYNAREC,   PicoOpt, POPT_EN_SVP_DRC),
 	mee_onoff     ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),
 	mee_end,
@@ -1453,12 +1443,12 @@ static int menu_loop_adv_options(menu_id id, int keys)
 
 static const char *mgn_opt_scaling(menu_id id, int *offs)
 {
-	*offs = -12;
+	*offs = -13;
 	switch (currentConfig.scaling) {
-		default: return "            OFF";
-		case 1:  return "hw horizontal";
-		case 2:  return "hw horiz. + vert.";
-		case 3:  return "sw horizontal";
+		default:               return "             OFF";
+		case EOPT_SCALE_HW_H:  return "   hw horizontal";
+		case EOPT_SCALE_HW_HV: return "hw horiz. + vert";
+		case EOPT_SCALE_SW_H:  return "   sw horizontal";
 	}
 }
 
@@ -1472,8 +1462,8 @@ static menu_entry e_menu_gfx_options[] =
 {
 	mee_range_cust("Scaling",                  MA_OPT_SCALING,        currentConfig.scaling, 0, 3, mgn_opt_scaling),
 	mee_range_cust("Gamma correction",         MA_OPT2_GAMMA,         currentConfig.gamma, 1, 300, mgn_aopt_gamma),
-	mee_onoff     ("A_SN's gamma curve",       MA_OPT2_A_SN_GAMMA,    currentConfig.EmuOpt, 0x1000),
-	mee_onoff     ("Perfect vsync",            MA_OPT2_VSYNC,         currentConfig.EmuOpt, 0x2000),
+	mee_onoff     ("A_SN's gamma curve",       MA_OPT2_A_SN_GAMMA,    currentConfig.EmuOpt, EOPT_A_SN_GAMMA),
+	mee_onoff     ("Perfect vsync",            MA_OPT2_VSYNC,         currentConfig.EmuOpt, EOPT_PSYNC),
 	mee_end,
 };
 
@@ -2054,6 +2044,22 @@ void me_update_msg(const char *msg)
 
 // ------------ util ------------
 
+/* wiz for now, probably extend later */
+void menu_plat_setup(int is_wiz)
+{
+	int i;
+
+	if (!is_wiz)
+		return;
+
+	me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);
+	me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);
+	me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);
+
+	i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);
+	e_menu_gfx_options[i].max = 1;	/* only off and sw */
+}
+
 /* TODO: rename */
 void menu_darken_bg(void *dst, int pixels, int darker)
 {