X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=77bd83e695fc1bf290347342edb54eb30be8b77c;hb=095a240bd91548be4b9770d28d5d6c3e97637094;hp=12d70e3d5ebae42e9b82fd5b6c8bf98c5ac7a481;hpb=7443ecd9586ff46c9ffbe8c2fdc719c722ff9b25;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 12d70e3..77bd83e 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -24,9 +24,9 @@
 #include "../common/config.h"
 #include "cpuctrl.h"
 
-#include <Pico/PicoInt.h>
-#include <Pico/Patch.h>
-#include <Pico/sound/mix.h>
+#include <pico/pico_int.h>
+#include <pico/patch.h>
+#include <pico/sound/mix.h>
 #include <zlib/zlib.h>
 
 //#define PFRAMES
@@ -49,7 +49,6 @@ static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
 static struct timeval noticeMsgTime = { 0, 0 };	// when started showing
 static int osd_fps_x;
 static int gp2x_old_gamma = 100;
-char noticeMsg[64];			// notice msg to draw
 unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 int reset_timing = 0;
 
@@ -66,7 +65,7 @@ void emu_noticeMsgUpdated(void)
 	gettimeofday(&noticeMsgTime, 0);
 }
 
-void emu_getMainDir(char *dst, int len)
+int emu_getMainDir(char *dst, int len)
 {
 	extern char **g_argv;
 	int j;
@@ -77,6 +76,8 @@ void emu_getMainDir(char *dst, int len)
 	dst[len] = 0;
 	for (j = strlen(dst); j > 0; j--)
 		if (dst[j] == '/') { dst[j+1] = 0; break; }
+
+	return j + 1;
 }
 
 void emu_Init(void)
@@ -167,16 +168,6 @@ void emu_prepareDefaultConfig(void)
 	defaultConfig.turbo_rate = 15;
 }
 
-void emu_setDefaultConfig(void)
-{
-	memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
-	PicoOpt = currentConfig.s_PicoOpt;
-	PsndRate = currentConfig.s_PsndRate;
-	PicoRegionOverride = currentConfig.s_PicoRegion;
-	PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
-	PicoCDBuffers = currentConfig.s_PicoCDBuffers;
-}
-
 void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
@@ -292,7 +283,7 @@ static void blit(const char *fps, const char *notice)
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal)
 		{
-			int pallen = 0x40;
+			int pallen = 0xc0;
 			Pico.m.dirtyPal = 0;
 			if (Pico.video.reg[0xC]&8) // shadow/hilight mode
 			{
@@ -302,21 +293,14 @@ static void blit(const char *fps, const char *notice)
 				memcpy32(localPal+0xc0, localPal+0x40, 0x40);
 				pallen = 0x100;
 			}
-			else if (rendstatus & PDRAW_ACC_SPRITES) {
-				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
-				memcpy32(localPal+0x40, localPal, 0x40);
-				memcpy32(localPal+0x80, localPal, 0x40);
-				memcpy32(localPal+0xc0, localPal, 0x40);
-				pallen = 0x100;
-			}
 			else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
 				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 				vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);
 				vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);
-				pallen = 0xc0;
 			}
 			else {
 				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+				memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess
 			}
 			if (pallen > 0xc0) {
 				localPal[0xc0] = 0x0000c000;