X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=9bc880a347b86dfe4524d27b0043262de597c6be;hb=b846453101c070b93938dd2224f0cca130a55e8c;hp=b7c926f56849da1092aca0cc50facfe736746a63;hpb=2707a9cbaae3230f65eb3d7c14c8820040165686;p=libpicofe.git

diff --git a/gp2x/menu.c b/gp2x/menu.c
index b7c926f..9bc880a 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -37,13 +37,13 @@ const char * const keyNames[] = {
 	"???",   "???",    "???",  "PUSH", "???",  "???", "???",      "???"
 };
 
-static void menu_darken_bg(void *dst, int pixels, int darker);
+void menu_darken_bg(void *dst, int pixels, int darker);
 static void menu_prepare_bg(int use_game_bg);
 
 static unsigned long inp_prev = 0;
 static int inp_prevjoy = 0;
 
-static unsigned long wait_for_input(unsigned long interesting)
+unsigned long wait_for_input(unsigned long interesting)
 {
 	unsigned long ret;
 	static int repeats = 0, wait = 20;
@@ -132,7 +132,7 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
 	return ret;
 }
 
-static void menu_flip(void)
+void menu_flip(void)
 {
 	gp2x_video_flush_cache();
 	gp2x_video_flip2();
@@ -429,72 +429,6 @@ rescan:
 	return ret;
 }
 
-// ------------ debug menu ------------
-
-char *debugString(void);
-void PicoDrawShowSpriteStats(unsigned short *screen);
-void PicoDrawShowPalette(unsigned short *screen);
-
-static void draw_main_debug(void)
-{
-	char *p, *str = debugString();
-	int len, line;
-
-	gp2x_pd_clone_buffer2();
-
-	p = str;
-	for (line = 0; line < 24; line++)
-	{
-		while (*p && *p != '\n') p++;
-		len = p - str;
-		if (len > 55) len = 55;
-		smalltext_out16_lim(1, line*10, str, 0xffff, len);
-		if (*p == 0) break;
-		p++; str = p;
-	}
-}
-
-static void draw_frame_debug(void)
-{
-	char layer_str[48] = "layers:             ";
-	if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);
-	if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);
-	if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
-	if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);
-
-	memset(gp2x_screen, 0, 320*240*2);
-	emu_forcedFrame();
-	smalltext_out16(4, 232, layer_str, 0xffff);
-}
-
-static void debug_menu_loop(void)
-{
-	int inp, mode = 0;
-
-	while (1)
-	{
-		switch (mode)
-		{
-			case 0: draw_main_debug(); break;
-			case 1: draw_frame_debug(); break;
-			case 2: PicoDrawShowSpriteStats(gp2x_screen); break;
-			case 3: PicoDrawShowPalette(gp2x_screen); break;
-		}
-		menu_flip();
-
-		inp = wait_for_input(GP2X_B|GP2X_X|GP2X_L|GP2X_R|GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT);
-		if (inp & (GP2X_B|GP2X_X)) return;
-		if (inp & GP2X_L) { mode--; if (mode < 0) mode = 3; }
-		if (inp & GP2X_R) { mode++; if (mode > 3) mode = 0; }
-		if (mode == 1) {
-			if (inp & GP2X_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;
-			if (inp & GP2X_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
-			if (inp & GP2X_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
-			if (inp & GP2X_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
-		}
-	}
-}
-
 // ------------ patch/gg menu ------------
 
 static void draw_patchlist(int sel)
@@ -605,7 +539,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));
@@ -1186,7 +1120,7 @@ menu_entry opt_entries[] =
 {
 	{ NULL,                        MB_NONE,  MA_OPT_RENDERER,      NULL, 0, 0, 0, 1, 1 },
 	{ NULL,                        MB_RANGE, MA_OPT_SCALING,       &currentConfig.scaling, 0, 0, 3, 1, 1 },
-	{ "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES,   &PicoOpt, 0x080, 0, 0, 1, 1 },
+	{ "Accurate sprites",          MB_ONOFF, MA_OPT_ACC_SPRITES,   &PicoOpt, 0x080, 0, 0, 0, 1 },
 	{ "Show FPS",                  MB_ONOFF, MA_OPT_SHOW_FPS,      &currentConfig.EmuOpt,  0x002, 0, 0, 1, 1 },
 	{ NULL,                        MB_RANGE, MA_OPT_FRAMESKIP,     &currentConfig.Frameskip, 0, -1, 16, 1, 1 },
 	{ "Enable sound",              MB_ONOFF, MA_OPT_ENABLE_SOUND,  &currentConfig.EmuOpt,  0x004, 0, 0, 1, 1 },
@@ -1651,7 +1585,7 @@ static void menu_loop_root(void)
 	}
 }
 
-static void menu_darken_bg(void *dst, int pixels, int darker)
+void menu_darken_bg(void *dst, int pixels, int darker)
 {
 	unsigned int *screen = dst;
 	pixels /= 2;