X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmenu.c;h=bc7c875733a9f2f7623e04acef51748a8f0cf4e8;hb=841644af9815f3659505e8dade8063eda2dbca73;hp=e1daabfbfc829141536c61fadac0d7d817a8124c;hpb=c633456460a2995bfa4732fb2fb0bca3c785936e;p=libpicofe.git

diff --git a/psp/menu.c b/psp/menu.c
index e1daabf..bc7c875 100644
--- a/psp/menu.c
+++ b/psp/menu.c
@@ -185,7 +185,7 @@ struct my_dirent
 static unsigned short file2color(const char *fname)
 {
 	const char *ext = fname + strlen(fname) - 3;
-	static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso" };
+	static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso" };
 	static const char *other_exts[] = { "gmv", "pat" };
 	int i;
 
@@ -1005,7 +1005,8 @@ menu_entry opt3_entries[] =
 	{ NULL,                        MB_NONE,  MA_OPT3_SCALE,         NULL, 0, 0, 0, 1 },
 	{ NULL,                        MB_NONE,  MA_OPT3_HSCALE32,      NULL, 0, 0, 0, 1 },
 	{ NULL,                        MB_NONE,  MA_OPT3_HSCALE40,      NULL, 0, 0, 0, 1 },
-	{ NULL,                        MB_ONOFF, MA_OPT3_FILTERING,     &currentConfig.scaling, 1, 0, 0, 1 },
+	{ NULL,                        MB_ONOFF, MA_OPT3_FILTERING,     &currentConfig.scaling, 1,  0,  0, 1 },
+	{ NULL,                        MB_RANGE, MA_OPT3_GAMMAA,        &currentConfig.gamma,   0, -4, 16, 1 },
 	{ NULL,                        MB_NONE,  MA_OPT3_VSYNC,         NULL, 0, 0, 0, 1 },
 	{ "Set to unscaled centered",  MB_NONE,  MA_OPT3_PRES_NOSCALE,  NULL, 0, 0, 0, 1 },
 	{ "Set to 4:3 scaled",         MB_NONE,  MA_OPT3_PRES_SCALE43,  NULL, 0, 0, 0, 1 },
@@ -1032,6 +1033,9 @@ static void menu_opt3_cust_draw(const menu_entry *entry, int x, int y, void *par
 		case MA_OPT3_FILTERING:
 			text_out16(x, y, "Bilinear filtering                 %s", currentConfig.scaling?"ON":"OFF");
 			break;
+		case MA_OPT3_GAMMAA:
+			text_out16(x, y, "Gamma adjustment                  %2i", currentConfig.gamma);
+			break;
 		case MA_OPT3_VSYNC: {
 			char *val = "    never";
 			if (currentConfig.EmuOpt & 0x2000)
@@ -1112,10 +1116,11 @@ static void dispmenu_loop_options(void)
 			int tmp;
 			me_process(opt3_entries, OPT3_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0);
 			switch (selected_id) {
-				case MA_OPT3_SCALE:    setting = &currentConfig.scale; break;
-				case MA_OPT3_HSCALE40: setting = &currentConfig.hscale40; is_32col = 0; break;
-				case MA_OPT3_HSCALE32: setting = &currentConfig.hscale32; is_32col = 1; break;
-				case MA_OPT3_FILTERING:menu_opt3_preview(is_32col); break;
+				case MA_OPT3_SCALE:	setting = &currentConfig.scale; break;
+				case MA_OPT3_HSCALE40:	setting = &currentConfig.hscale40; is_32col = 0; break;
+				case MA_OPT3_HSCALE32:	setting = &currentConfig.hscale32; is_32col = 1; break;
+				case MA_OPT3_FILTERING:
+				case MA_OPT3_GAMMAA:	menu_opt3_preview(is_32col); break;
 				case MA_OPT3_VSYNC:    tmp = ((currentConfig.EmuOpt>>13)&1) | ((currentConfig.EmuOpt>>15)&2);
 					tmp = (inp & BTN_LEFT) ? (tmp>>1) : ((tmp<<1)|1);
 					if (tmp > 3) tmp = 3;
@@ -1389,6 +1394,10 @@ static void menu_options_save(void)
 	PicoOpt = currentConfig.PicoOpt;
 	PsndRate = currentConfig.PsndRate;
 	PicoRegionOverride = currentConfig.PicoRegion;
+	if (PicoRegionOverride) {
+		// force setting possibly changed..
+		Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
+	}
 	if (!(PicoOpt & 0x20)) {
 		// unbind XYZ MODE, just in case
 		unbind_action(0xf00);