X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Fmenu.c;h=5da9c23b30a801ef8e51672f6b23ae59614a1a08;hb=ea08c2967b1c61e3b81c911dfd5eb7a0e72a28bf;hp=bf56c32e5c9009b83b63e7b4b7e34a07c84a172b;hpb=da42200b24749eee63cccf49d87781b861146e9f;p=picodrive.git

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index bf56c32..5da9c23 100644
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -45,7 +45,6 @@ static void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
 static void menu_prepare_bg(int use_game_bg);
 
 static unsigned int inp_prev = 0;
-static int inp_prevjoy = 0;
 
 static unsigned long wait_for_input(unsigned int interesting)
 {
@@ -71,7 +70,6 @@ static unsigned long wait_for_input(unsigned int interesting)
 		wait = 50;
 	}
 	inp_prev = ret;
-	inp_prevjoy = 0;
 
 	// we don't need diagonals in menus
 	if ((ret&BTN_UP)   && (ret&BTN_LEFT))  ret &= ~BTN_LEFT;
@@ -92,8 +90,7 @@ static void menu_draw_begin(int use_bgbuff)
 
 static void menu_draw_end(void)
 {
-	Framework2D_WaitVSync();
-	giz_screen = Framework2D_LockBuffer();
+	giz_screen = Framework2D_LockBuffer(0);
 	if (giz_screen == NULL)
 	{
 		lprintf_al("%s: Framework2D_LockBuffer() returned NULL\n", __FUNCTION__);
@@ -102,6 +99,7 @@ static void menu_draw_end(void)
 	memcpy32(giz_screen, (int *)menu_screen, 321*240*2/4);
 	Framework2D_UnlockBuffer();
 	giz_screen = NULL;
+	Framework2D_Flip(1);
 }
 
 
@@ -160,7 +158,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;
 
@@ -264,10 +262,10 @@ static int my_scandir(const char *dir, struct my_dirent ***namelist_out,
 	BOOL bRet;
 
 	wdir = malloc(sizeof(wdir[0]) * MAX_PATH);
-	if (wdir == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; }
+	if (wdir == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; }
 
 	namelist = malloc(sizeof(*namelist) * name_alloc);
-	if (namelist == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; }
+	if (namelist == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; }
 
 	// try to read first..
 	len = cstr2wstr(wdir, dir);
@@ -312,7 +310,7 @@ static int my_scandir(const char *dir, struct my_dirent ***namelist_out,
 			void *tmp;
 			name_alloc *= 2;
 			tmp = realloc(namelist, sizeof(*namelist) * name_alloc);
-			if (tmp == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; }
+			if (tmp == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; }
 			namelist = tmp;
 		}
 
@@ -635,6 +633,7 @@ static int savestate_menu_loop(int is_loading)
 		if(inp & BTN_PLAY) { // save/load
 			if (menu_sel < 10) {
 				state_slot = menu_sel;
+				PicoStateProgressCB = emu_stateCb; /* also suitable for menu */
 				if (emu_SaveLoadGame(is_loading, 0)) {
 					strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed");
 					return 1;
@@ -991,6 +990,7 @@ menu_entry opt2_entries[] =
 	{ "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &currentConfig.PicoOpt,0x0004, 0, 0, 1 },
 	{ "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &currentConfig.PicoOpt,0x0001, 0, 0, 1 },
 	{ "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&currentConfig.PicoOpt,0x0002, 0, 0, 1 },
+	{ "Double buffering",          MB_ONOFF, MA_OPT2_DBLBUFF,       &currentConfig.EmuOpt, 0x8000, 0, 0, 1 },
 	{ "Wait for V-sync (slow)",    MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1 },
 	{ "gzip savestates",           MB_ONOFF, MA_OPT2_GZIP_STATES,   &currentConfig.EmuOpt, 0x0008, 0, 0, 1 },
 	{ "Don't save last used ROM",  MB_ONOFF, MA_OPT2_NO_LAST_ROM,   &currentConfig.EmuOpt, 0x0020, 0, 0, 1 },
@@ -1057,7 +1057,7 @@ static void amenu_loop_options(void)
 menu_entry opt_entries[] =
 {
 	{ NULL,                        MB_NONE,  MA_OPT_RENDERER,      NULL, 0, 0, 0, 1 },
-	{ "Interlaced rend. (faster)", MB_ONOFF, MA_OPT_INTERLACED,    &currentConfig.EmuOpt,  0x4000, 0, 0, 1 },
+	{ "Scanline mode (faster)",    MB_ONOFF, MA_OPT_INTERLACED,    &currentConfig.EmuOpt,  0x4000, 0, 0, 1 },
 	{ "Scale low res mode",        MB_ONOFF, MA_OPT_SCALING,       &currentConfig.scaling, 0x0001, 0, 3, 1 },
 	{ "Accurate timing (slower)",  MB_ONOFF, MA_OPT_ACC_TIMING,    &currentConfig.PicoOpt, 0x0040, 0, 0, 1 },
 	{ "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES,   &currentConfig.PicoOpt, 0x0080, 0, 0, 1 },
@@ -1211,6 +1211,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);
@@ -1354,10 +1358,10 @@ static void draw_menu_credits(void)
 	menu_draw_begin(1);
 
 	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");
-text_out16(tl_x, 30, "rc1");
+
 	y = tl_y;
 	text_out16(tl_x, y, "Credits:");
-	text_out16(tl_x, (y+=10), "Dave: Cyclone 68000 core,");
+	text_out16(tl_x, (y+=10), "fDave: Cyclone 68000 core,");
 	text_out16(tl_x, (y+=10), "      base code of PicoDrive");
 	text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");
 	text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");
@@ -1562,7 +1566,7 @@ static void menu_prepare_bg(int use_game_bg)
 	{
 		// darken the active framebuffer
 		if (giz_screen == NULL)
-			giz_screen = Framework2D_LockBuffer();
+			giz_screen = Framework2D_LockBuffer(1);
 		memset(bg_buffer, 0, 321*8*2);
 		menu_darken_bg(bg_buffer + 321*8*2, (char *)giz_screen + 321*8*2, 321*224, 1);
 		memset(bg_buffer + 321*232*2, 0, 321*8*2);