X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpandora%2Femu.c;h=a749836b81f690790ebde8b4f065d93b2cdfe1b7;hb=16b0afd0294a8acde173e2973f9a35eafe0bd185;hp=0c6935b1b84e55f982eb9ae4bf61b6cebbf07827;hpb=f8af96349ea464111fbef3c6528016c3dc34cdcf;p=picodrive.git

diff --git a/platform/pandora/emu.c b/platform/pandora/emu.c
index 0c6935b..a749836 100644
--- a/platform/pandora/emu.c
+++ b/platform/pandora/emu.c
@@ -24,9 +24,9 @@
 #include "../common/common.h"
 #include "asm_utils.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
@@ -139,7 +139,7 @@ void emu_prepareDefaultConfig(void)
 	defaultConfig.EmuOpt    = 0x8f | 0x00600; // | <- confirm_save, cd_leds
 	defaultConfig.s_PicoOpt  = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC;
 	defaultConfig.s_PicoOpt |= POPT_ACC_SPRITES|POPT_EN_MCD_GFX;
-	defaultConfig.s_PicoOpt &= ~POPT_EN_SVP_DRC; // crashes :(
+//	defaultConfig.s_PicoOpt &= ~POPT_EN_SVP_DRC; // crashes :(
 	defaultConfig.EmuOpt    &= ~8; // no save gzip
 	defaultConfig.s_PsndRate = 44100;
 	defaultConfig.s_PicoRegion = 0;
@@ -294,8 +294,8 @@ static int EmuScanEnd16(unsigned int num)
 		len = 256;
 	}
 
-	if (!sh && (rendstatus & PDRAW_ACC_SPRITES))
-		mask=0x3f; // accurate sprites, upper bits are priority stuff
+	if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))
+		mask=0x3f; // messed sprites, upper bits are priority stuff
 
 #if 1
 	clut_line(pd, ps, pal, (mask<<16) | len);
@@ -775,6 +775,11 @@ void emu_forcedFrame(int opts)
 	currentConfig.EmuOpt = eo_old;
 }
 
+void emu_platformDebugCat(char *str)
+{
+	// nothing
+}
+
 static void simpleWait(int thissec, int lim_time)
 {
 	struct timeval tval;
@@ -996,7 +1001,8 @@ void emu_Loop(void)
 
 		if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection
 			reset_timing = 1;
-/*		else if (PsndOut != NULL || currentConfig.Frameskip < 0)
+#if 1
+		else if (PsndOut != NULL || currentConfig.Frameskip < 0)
 		{
 			// sleep or vsync if we are still too fast
 			// usleep sleeps for ~20ms minimum, so it is not a solution here
@@ -1012,7 +1018,7 @@ void emu_Loop(void)
 				}
 			}
 		}
-*/
+#endif
 		blit(fpsbuff, notice);
 
 		pframes_done++; pframes_shown++;