X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=platform%2Fcommon%2Fmenu_pico.c;h=cc1163826236a1d637bf60bc178900a1d27c1a71;hp=306326bfb2cca5bf539cd83e6db75c00523c8e46;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=7b3ddc11dc21025f2a64116d664c745c07c54984

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 306326b..cc11638 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -14,7 +14,7 @@
 #include "input_pico.h"
 #include "version.h"
 
-#include <pico/pico.h>
+#include <pico/pico_int.h>
 #include <pico/patch.h>
 
 #ifdef PANDORA
@@ -119,11 +119,14 @@ static void menu_enter(int is_rom_loaded)
 	}
 	else
 	{
+		int pos;
 		char buff[256];
+		pos = plat_get_skin_dir(buff, 256);
+		strcpy(buff + pos, "background.png");
 
 		// should really only happen once, on startup..
-		emu_make_path(buff, "skin/background.png", sizeof(buff));
-		if (readpng(g_menubg_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h) < 0)
+		if (readpng(g_menubg_ptr, buff, READPNG_BG,
+						g_menuscreen_w, g_menuscreen_h) < 0)
 			memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
 	}
 
@@ -411,7 +414,7 @@ static menu_entry e_menu_cd_options[] =
 	mee_onoff_h("CDDA audio",           MA_CDOPT_CDDA,          PicoOpt, POPT_EN_MCD_CDDA, h_cdda),
 	mee_onoff_h("PCM audio",            MA_CDOPT_PCM,           PicoOpt, POPT_EN_MCD_PCM, h_cdpcm),
 	mee_onoff_h("SaveRAM cart",         MA_CDOPT_SAVERAM,       PicoOpt, POPT_EN_MCD_RAMCART, h_srcart),
-	mee_onoff_h("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx),
+	mee_onoff_h("Scale/Rot. fx",        MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx),
 	mee_end,
 };
 
@@ -800,11 +803,13 @@ static void draw_text_debug(const char *str, int skip, int from)
 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);
-	if (PicoDrawMask & PDRAW_32X_ON)         memcpy(layer_str + 26, "32x", 4);
+	struct PicoVideo *pv = &Pico.video;
+
+	if (!(pv->debug_p & PVD_KILL_B))    memcpy(layer_str +  8, "B", 1);
+	if (!(pv->debug_p & PVD_KILL_A))    memcpy(layer_str + 10, "A", 1);
+	if (!(pv->debug_p & PVD_KILL_S_LO)) memcpy(layer_str + 12, "spr_lo", 6);
+	if (!(pv->debug_p & PVD_KILL_S_HI)) memcpy(layer_str + 19, "spr_hi", 6);
+	if (!(pv->debug_p & PVD_KILL_32X))  memcpy(layer_str + 26, "32x", 4);
 
 	pemu_forced_frame(1, 0);
 	make_bg(1);
@@ -815,6 +820,7 @@ static void draw_frame_debug(void)
 
 static void debug_menu_loop(void)
 {
+	struct PicoVideo *pv = &Pico.video;
 	int inp, mode = 0;
 	int spr_offs = 0, dumped = 0;
 	char *tmp;
@@ -875,11 +881,11 @@ static void debug_menu_loop(void)
 				}
 				break;
 			case 1:
-				if (inp & PBTN_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;
-				if (inp & PBTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
-				if (inp & PBTN_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
-				if (inp & PBTN_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
-				if (inp & PBTN_MA2)   PicoDrawMask ^= PDRAW_32X_ON;
+				if (inp & PBTN_LEFT)  pv->debug_p ^= PVD_KILL_B;
+				if (inp & PBTN_RIGHT) pv->debug_p ^= PVD_KILL_A;
+				if (inp & PBTN_DOWN)  pv->debug_p ^= PVD_KILL_S_LO;
+				if (inp & PBTN_UP)    pv->debug_p ^= PVD_KILL_S_HI;
+				if (inp & PBTN_MA2)   pv->debug_p ^= PVD_KILL_32X;
 				if (inp & PBTN_MOK) {
 					PsndOut = NULL; // just in case
 					PicoSkipFrame = 1;