X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fuiq3%2Fengine%2Fvid.cpp;h=b07e4a4d88046a13bab67cbd7a21b97d8ade7674;hb=40644bfedd0b60d309dd23bc1e698ae3fa75375a;hp=bd1b3fd68e77c1f28e72123f774af6f260c39f7b;hpb=ca482e5de8bacb70db55f43afe02f93fe6fe3f16;p=picodrive.git

diff --git a/platform/uiq3/engine/vid.cpp b/platform/uiq3/engine/vid.cpp
index bd1b3fd..b07e4a4 100644
--- a/platform/uiq3/engine/vid.cpp
+++ b/platform/uiq3/engine/vid.cpp
@@ -5,7 +5,7 @@
 
 #include "vid.h"
 #include "../Engine.h"
-#include <Pico/PicoInt.h>
+#include <pico/pico_int.h>
 #include "../../common/emu.h"
 #include "blit.h"
 #include "debug.h"
@@ -182,7 +182,7 @@ static void drawTextM2Fat(int x, int y, const char *text)
 static void drawTextFpsCenter0(const char *text)
 {
 	if(!text) return;
-	drawTextM2(214, 216, text);
+	drawTextM2((Pico.video.reg[12]&1) ? 234 : 214, 216, text);
 }
 
 static void drawTextFpsFit0(const char *text)
@@ -206,7 +206,7 @@ static void drawTextFps0(const char *text)
 static void drawTextNoticeCenter0(const char *text)
 {
 	if(!text) return;
-	drawTextM2(2, 216, text);
+	drawTextM2(42, 216, text);
 }
 
 static void drawTextNoticeFit0(const char *text)
@@ -250,12 +250,14 @@ static void fillLocalPal(void)
 		memcpy32(localPal+0xc0, localPal+0x40, 0x40);
 		localPal[0xe0] = 0x00000000; // reserved pixels for OSD
 		localPal[0xf0] = 0x00ee0000;
-	} else if (rendstatus & 0x20) { // mid-frame palette changes
+	}
+	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);
 	} else {
 		vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+		memcpy32(localPal+0x80, localPal, 0x40); // for sprite prio mess
 	}
 }
 
@@ -266,8 +268,6 @@ static void vidBlit_90(int full)
 	unsigned char *ps = PicoDraw2FB+328*8;
 	unsigned long *pd = (unsigned long *) screenbuff;
 
-	if (Pico.m.dirtyPal) fillLocalPal();
-
 	if(Pico.video.reg[12]&1)
 		vidConvCpy_90(pd, ps, localPal, 320/8);
 	else {
@@ -284,8 +284,6 @@ static void vidBlit_270(int full)
 	unsigned char *ps = PicoDraw2FB+328*8;
 	unsigned long *pd = (unsigned long *) screenbuff;
 
-	if (Pico.m.dirtyPal) fillLocalPal();
-
 	if(Pico.video.reg[12]&1)
 		vidConvCpy_270(pd, ps, localPal, 320/8);
 	else {
@@ -303,8 +301,6 @@ static void vidBlitCenter_0(int full)
 	unsigned char *ps = PicoDraw2FB+328*8+8;
 	unsigned long *pd = (unsigned long *) screenbuff;
 
-	if (Pico.m.dirtyPal) fillLocalPal();
-
 	if(Pico.video.reg[12]&1) ps += 32;
 	vidConvCpy_center_0(pd, ps, localPal);
 	if(full) vidClear(pd + 224*256, 96);
@@ -316,8 +312,6 @@ static void vidBlitCenter_180(int full)
 	unsigned char *ps = PicoDraw2FB+328*8+8;
 	unsigned long *pd = (unsigned long *) screenbuff;
 
-	if (Pico.m.dirtyPal) fillLocalPal();
-
 	if(Pico.video.reg[12]&1) ps += 32;
 	vidConvCpy_center_180(pd, ps, localPal);
 	if(full) vidClear(pd + 224*256, 96);
@@ -326,10 +320,8 @@ static void vidBlitCenter_180(int full)
 
 static void vidBlitFit_0(int full)
 {
-	if (Pico.m.dirtyPal) fillLocalPal();
-
 	if(Pico.video.reg[12]&1)
-		 vidConvCpy_center2_40c_0(screenbuff, PicoDraw2FB+328*8, localPal, 168);
+	     vidConvCpy_center2_40c_0(screenbuff, PicoDraw2FB+328*8, localPal, 168);
 	else vidConvCpy_center2_32c_0(screenbuff, PicoDraw2FB+328*8, localPal, 168);
 	if(full) vidClear((unsigned long *)screenbuff + 168*256, 320-168);
 }
@@ -337,8 +329,6 @@ static void vidBlitFit_0(int full)
 
 static void vidBlitFit_180(int full)
 {
-	if (Pico.m.dirtyPal) fillLocalPal();
-
 	if(Pico.video.reg[12]&1)
 	     vidConvCpy_center2_40c_180(screenbuff, PicoDraw2FB+328*8, localPal, 168);
 	else vidConvCpy_center2_32c_180(screenbuff, PicoDraw2FB+328*8-64, localPal, 168);
@@ -348,8 +338,6 @@ static void vidBlitFit_180(int full)
 
 static void vidBlitFit2_0(int full)
 {
-	if (Pico.m.dirtyPal) fillLocalPal();
-
 	if(Pico.video.reg[12]&1)
 	     vidConvCpy_center2_40c_0(screenbuff, PicoDraw2FB+328*8, localPal, 224);
 	else vidConvCpy_center2_32c_0(screenbuff, PicoDraw2FB+328*8, localPal, 224);
@@ -359,8 +347,6 @@ static void vidBlitFit2_0(int full)
 
 static void vidBlitFit2_180(int full)
 {
-	if (Pico.m.dirtyPal) fillLocalPal();
-
 	if(Pico.video.reg[12]&1)
 	     vidConvCpy_center2_40c_180(screenbuff, PicoDraw2FB+328*8, localPal, 224);
 	else vidConvCpy_center2_32c_180(screenbuff, PicoDraw2FB+328*8-64, localPal, 224);
@@ -403,6 +389,7 @@ int vidInit(void *vidmem, int reinit)
 	// select suitable blitters
 	vidBlit = vidBlit_270;
 	PicoScanBegin = EmuScanBegin8;
+	PicoScanEnd = NULL;
 	drawTextFps = drawTextFps0;
 	drawTextNotice = drawTextNotice0;
 
@@ -425,6 +412,7 @@ int vidInit(void *vidmem, int reinit)
 			vidBlit = vidBlitFit_0;
 			drawTextFps = drawTextFpsFit0;
 			drawTextNotice = drawTextNoticeFit0;
+			PicoScanBegin = NULL;
 			PicoScanEnd = EmuScanEndFit0;
 		}
 	} else if (currentConfig.rotation == TPicoConfig::PRot90) {
@@ -446,6 +434,7 @@ int vidInit(void *vidmem, int reinit)
 			vidBlit = vidBlitFit_180;
 			drawTextFps = drawTextFpsFit0;
 			drawTextNotice = drawTextNoticeFit0;
+			PicoScanBegin = NULL;
 			PicoScanEnd = EmuScanEndFit0;
 		}
 	}
@@ -453,6 +442,7 @@ int vidInit(void *vidmem, int reinit)
 		vidBlit = vidBlit_270;
 	}
 
+	fillLocalPal();
 	vidBlit(1);
 	PicoOpt |= 0x100;
 	Pico.m.dirtyPal = 1;
@@ -475,6 +465,7 @@ void vidDrawFrame(char *noticeStr, char *fpsStr, int num)
 		drawTextFps(fpsStr);
 	drawTextNotice(noticeStr);
 
+	if (Pico.m.dirtyPal) fillLocalPal();
 	vidBlit(!num); // copy full frame once a second
 }