X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Fmenu.c;h=33c6fc02c4568626075176fb1d3777353d9b8219;hb=0fc0e24180bc89d8a5be33464669de0691720e9d;hp=09520a986ca122925a542a0a354a17962a23312f;hpb=58c86d00183ba47cb3c9c277ac3538045b5604ad;p=picodrive.git

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index 09520a9..33c6fc0 100644
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -48,16 +48,17 @@ static unsigned int inp_prev = 0;
 
 static unsigned long wait_for_input(unsigned int interesting)
 {
-	unsigned int ret;
-	static int repeats = 0, wait = 50;
+	unsigned long ret;
+	static int repeats = 0, wait = 20;
 	int release = 0, i;
 
-	if (repeats == 2 || repeats == 4) wait /= 2;
-	if (repeats == 6) wait = 15;
+	if      (repeats == 2) wait = 3;
+	else if (repeats == 4) wait = 2;
+	else if (repeats == 6) wait = 1;
 
-	for (i = 0; i < 6 && inp_prev == Framework_PollGetButtons(); i++) {
+	for (i = 0; i < wait && inp_prev == Framework_PollGetButtons(); i++) {
 		if (i == 0) repeats++;
-		Sleep(wait);
+		Sleep(30);
 	}
 
 	while ( !((ret = Framework_PollGetButtons()) & interesting) ) {
@@ -67,8 +68,10 @@ static unsigned long wait_for_input(unsigned int interesting)
 
 	if (release || ret != inp_prev) {
 		repeats = 0;
-		wait = 50;
+		wait = 20;
 	}
+	if (wait > 6 && (ret&(BTN_UP|BTN_LEFT|BTN_DOWN|BTN_RIGHT|BTN_L|BTN_R)))
+		wait = 6;
 	inp_prev = ret;
 
 	// we don't need diagonals in menus
@@ -561,7 +564,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
@@ -575,7 +578,7 @@ static void draw_savestate_bg(int slot)
 		areaClose(file);
 	}
 
-	emu_forcedFrame();
+	emu_forcedFrame(POPT_EN_SOFTSCALE);
 	menu_prepare_bg(1);
 
 	memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
@@ -687,9 +690,7 @@ static int count_bound_keys(int action, int pl_idx)
 	return keys;
 }
 
-typedef struct { char *name; int mask; } bind_action_t;
-
-static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_idx, int sel)
+static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx, int sel)
 {
 	int x, y, tl_y = 40, i;
 
@@ -723,7 +724,7 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i
 	menu_draw_end();
 }
 
-static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_idx)
+static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx)
 {
 	int sel = 0, menu_sel_max = opt_cnt, prev_select = 0, i;
 	unsigned long inp = 0;
@@ -777,27 +778,10 @@ static void draw_kc_sel(int menu_sel)
 }
 
 
-// PicoPad[] format: MXYZ SACB RLDU
-static bind_action_t ctrl_actions[] =
-{
-	{ "UP     ", 0x001 },
-	{ "DOWN   ", 0x002 },
-	{ "LEFT   ", 0x004 },
-	{ "RIGHT  ", 0x008 },
-	{ "A      ", 0x040 },
-	{ "B      ", 0x010 },
-	{ "C      ", 0x020 },
-	{ "START  ", 0x080 },
-	{ "MODE   ", 0x800 },
-	{ "X      ", 0x400 },
-	{ "Y      ", 0x200 },
-	{ "Z      ", 0x100 },
-};
-
 // player2_flag, ?, ?, ?, ?, ?, ?, menu
 // "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"
-static bind_action_t emuctrl_actions[] =
+me_bind_action emuctrl_actions[] =
 {
 	{ "Load State     ", 1<<28 },
 	{ "Save State     ", 1<<27 },
@@ -806,6 +790,7 @@ static bind_action_t emuctrl_actions[] =
 	{ "Switch Renderer", 1<<26 },
 	{ "Volume Down    ", 1<<30 },
 	{ "Volume Up      ", 1<<29 },
+	{ NULL,              0     }
 };
 
 static void kc_sel_loop(void)
@@ -822,10 +807,10 @@ static void kc_sel_loop(void)
 		if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
 		if (inp & BTN_PLAY) {
 			switch (menu_sel) {
-				case 0: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 0); return;
-				case 1: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 1); return;
+				case 0: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 0); return;
+				case 1: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 1); return;
 				case 2: key_config_loop(emuctrl_actions,
-						sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]), -1); return;
+						sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;
 				case 3: if (!rom_loaded) emu_WriteConfig(0); return;
 				default: return;
 			}
@@ -939,9 +924,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
 				}
@@ -987,6 +972,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 },
@@ -1059,7 +1045,6 @@ menu_entry opt_entries[] =
 	{ NULL,                        MB_NONE,  MA_OPT_RENDERER,      NULL, 0, 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 },
 	{ "Show FPS",                  MB_ONOFF, MA_OPT_SHOW_FPS,      &currentConfig.EmuOpt,  0x0002, 0, 0, 1 },
 	{ NULL,                        MB_RANGE, MA_OPT_FRAMESKIP,     &currentConfig.Frameskip, 0, -1, 16, 1 },
@@ -1242,7 +1227,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;
@@ -1329,10 +1314,10 @@ static int menu_loop_options(void)
 
 static void draw_menu_credits(void)
 {
-	int tl_x = 15, tl_y = 64, y;
+	int tl_x = 15, tl_y = 56, 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:");
@@ -1340,14 +1325,16 @@ static void draw_menu_credits(void)
 	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");
-	text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");
-	text_out16(tl_x, (y+=10), "Stephane Dallongeville:");
-	text_out16(tl_x, (y+=10), "      opensource Gens");
-	text_out16(tl_x, (y+=10), "Haze: Genesis hw info");
 	text_out16(tl_x, (y+=10), "Reesy: kgsdk wrapper, sound code");
 	text_out16(tl_x, (y+=10), "jens.l: gizmondo hardware");
 	text_out16(tl_x, (y+=10), "ketchupgun: skin design");
 
+	text_out16(tl_x, (y+=20), "special thanks (for docs, ideas)");
+	text_out16(tl_x, (y+=10), " Charles MacDonald, Haze,");
+	text_out16(tl_x, (y+=10), " Stephane Dallongeville,");
+	text_out16(tl_x, (y+=10), " Lordus, Exophase, Rokas,");
+	text_out16(tl_x, (y+=10), " Nemesis, Tasco Deluxe");
+
 	menu_draw_end();
 }
 
@@ -1447,6 +1434,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;
 					}
@@ -1454,6 +1442,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;
 					}
@@ -1635,10 +1624,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);