bugfix in sprite viewer

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@546 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Debug.c b/Pico/Debug.c
index 3783ac5..50bd2e5 100644 (file)
--- a/Pico/Debug.c
+++ b/Pico/Debug.c
@@ -219,9 +219,9 @@ void PDebugShowSprite(unsigned short *screen, int stride, int which)
     sprite=(int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite
 
     link=(sprite[0]>>16)&0x7f;
-    if(!link) return; // End of sprites
+    if (!link) break; // End of sprites
   }
-  if (u == max_sprites) return;
+  if (u >= max_sprites) return;
 
   fsprite = (int *)(Pico.vram+(table&0x7ffc));
   oldsprite[0] = fsprite[0];
@@ -239,7 +239,7 @@ void PDebugShowSprite(unsigned short *screen, int stride, int which)
   {
     unsigned char *ps = PicoDraw2FB + DRAW2_LINE_WIDTH*y + 8;
     for (x = 0; x < 8*4; x++)
-      if (ps[x]) screen[x] = HighPal[ps[x]];
+      if (ps[x]) screen[x] = HighPal[ps[x]], ps[x] = 0;
     screen += stride;
   }
 

diff --git a/Pico/Draw2.c b/Pico/Draw2.c
index 27a94dd..054cee9 100644 (file)
--- a/Pico/Draw2.c
+++ b/Pico/Draw2.c
@@ -587,7 +587,7 @@ static void DrawDisplayFull(void)
 \r
        if (HighCache2B[1]) DrawTilesFromCacheF(HighCache2B);\r
        if (HighCache2A[1]) DrawTilesFromCacheF(HighCache2A);\r
-       switch (hvwin)\r
+       if (PicoDrawMask & PDRAW_LAYERA_ON) switch (hvwin)\r
        {\r
                case 4:\r
                // fullscreen window\r