X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Fmenu.c;h=1c74589af0d03411d90142d68da1cacd8c6e1742;hb=52250671ae14d00dfcb52d137f73c9b565493279;hp=d46128692f5fd2a1b7ee637a997f55c086960eef;hpb=bdec53c90b6e53990fc206cabaec31b844f34d1e;p=picodrive.git

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index d461286..1c74589 100644
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -561,7 +561,7 @@ static void draw_savestate_bg(int slot)
 	}
 
 	if (file) {
-		if (PicoMCD & 1) {
+		if (PicoAHW & 1) {
 			PicoCdLoadStateGfx(file);
 		} else {
 			areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file
@@ -921,9 +921,9 @@ static void cd_menu_loop_options(void)
 			    selected_id == MA_CDOPT_READAHEAD) {
 				if (inp & BTN_LEFT) {
 					PicoCDBuffers >>= 1;
-					if (PicoCDBuffers < 64) PicoCDBuffers = 0;
+					if (PicoCDBuffers < 2) PicoCDBuffers = 0;
 				} else {
-					if (PicoCDBuffers < 64) PicoCDBuffers = 64;
+					if (PicoCDBuffers < 2) PicoCDBuffers = 2;
 					else PicoCDBuffers <<= 1;
 					if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M
 				}
@@ -969,6 +969,7 @@ static void cd_menu_loop_options(void)
 
 menu_entry opt2_entries[] =
 {
+	{ "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },
 	{ "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 },
@@ -1224,7 +1225,7 @@ static int menu_loop_options(void)
 							currentConfig.PsndRate =  11025;
 							currentConfig.PicoOpt |=  8;
 						} else if ((inp & BTN_LEFT) && currentConfig.PsndRate == 11025 &&
-								(currentConfig.PicoOpt&0x08) && !(PicoMCD&1))
+								(currentConfig.PicoOpt&0x08) && !(PicoAHW&1))
 						{
 							currentConfig.PsndRate =  44100;
 							currentConfig.PicoOpt &= ~8;
@@ -1314,7 +1315,7 @@ static void draw_menu_credits(void)
 	int tl_x = 15, tl_y = 64, y;
 	menu_draw_begin(1);
 
-	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");
+	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");
 
 	y = tl_y;
 	text_out16(tl_x, y, "Credits:");
@@ -1429,6 +1430,7 @@ static void menu_loop_root(void)
 					if (rom_loaded) {
 						if(savestate_menu_loop(1))
 							continue;
+						while (Framework_PollGetButtons() & BTN_PLAY) Sleep(50);
 						engineState = PGS_Running;
 						return;
 					}
@@ -1436,6 +1438,7 @@ static void menu_loop_root(void)
 				case MA_MAIN_RESET_GAME:
 					if (rom_loaded) {
 						emu_ResetGame();
+						while (Framework_PollGetButtons() & BTN_PLAY) Sleep(50);
 						engineState = PGS_Running;
 						return;
 					}
@@ -1617,10 +1620,11 @@ int menu_loop_tray(void)
 				case 0: // select image
 					selfname = romsel_loop(curr_path);
 					if (selfname) {
-						int ret = -1, cd_type;
+						int ret = -1;
+						cd_img_type cd_type;
 						cd_type = emu_cdCheck(NULL);
-						if (cd_type > 0)
-							ret = Insert_CD(romFileName, cd_type == 2);
+						if (cd_type != CIT_NOT_CD)
+							ret = Insert_CD(romFileName, cd_type);
 						if (ret != 0) {
 							sprintf(menuErrorMsg, "Load failed, invalid CD image?");
 							lprintf("%s\n", menuErrorMsg);