amalgamation

[picodrive.git] / Pico / Draw2.c

diff --git a/Pico/Draw2.c b/Pico/Draw2.c
index 2484164..5037e2f 100644 (file)
--- a/Pico/Draw2.c
+++ b/Pico/Draw2.c
@@ -10,10 +10,6 @@
 \r
 \r
 #include "PicoInt.h"\r
-#include <assert.h>\r
-#ifndef __GNUC__\r
-#pragma warning (disable:4706) // Disable assignment within conditional\r
-#endif\r
 \r
 // port_config.h include must define these 2 defines:\r
 // #define START_ROW  1 // which row of tiles to start rendering at?\r
@@ -28,8 +24,8 @@
 extern unsigned char *framebuff; // in format (8+320)x(8+224+8) (eights for borders)\r
 int currpri = 0;\r
 \r
-static int HighCacheA[41*(TILE_ROWS+1)+1+1]; // caches for high layers\r
-static int HighCacheB[41*(TILE_ROWS+1)+1+1];\r
+static int HighCache2A[41*(TILE_ROWS+1)+1+1]; // caches for high layers\r
+static int HighCache2B[41*(TILE_ROWS+1)+1+1];\r
 \r
 unsigned short *PicoCramHigh=Pico.cram; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)\r
 void (*PicoPrepareCram)()=0;            // prepares PicoCramHigh for renderer to use\r
@@ -235,9 +231,9 @@ static void DrawLayerFull(int plane, int *hcache, int planestart, int planeend)
        height=(width>>4)&3; width&=3;\r
 \r
        xmask=(1<<shift[width ])-1; // X Mask in tiles\r
-    ymask=(height<<5)|0x1f;     // Y Mask in tiles\r
-    if(width == 1)   ymask&=0x3f;\r
-    else if(width>1) ymask =0x1f;\r
+       ymask=(height<<5)|0x1f;     // Y Mask in tiles\r
+       if(width == 1)   ymask&=0x3f;\r
+       else if(width>1) ymask =0x1f;\r
 \r
        // Find name table:\r
        if (plane==0) nametab=(pvid->reg[2]&0x38)<< 9; // A\r
@@ -563,17 +559,17 @@ static void DrawDisplayFull()
        if(hvwin==1) { winend|=maxcolc<<16; planeend|=maxcolc<<16; }\r
 \r
        currpri = 0;\r
-       DrawLayerFull(1, HighCacheB, START_ROW, (maxcolc<<16)|END_ROW);\r
+       DrawLayerFull(1, HighCache2B, START_ROW, (maxcolc<<16)|END_ROW);\r
        switch(hvwin) {\r
                case 4:\r
                // fullscreen window\r
                DrawWindowFull(START_ROW, (maxcolc<<16)|END_ROW, 0);\r
-               HighCacheA[1] = 0;\r
+               HighCache2A[1] = 0;\r
                break;\r
 \r
                case 3:\r
                // we have plane A and both v and h windows\r
-               DrawLayerFull(0, HighCacheA, planestart, planeend);\r
+               DrawLayerFull(0, HighCache2A, planestart, planeend);\r
                DrawWindowFull( winstart&~0xff0000, (winend&~0xff0000)|(maxcolc<<16), 0); // h\r
                DrawWindowFull((winstart&~0xff)|START_ROW, (winend&~0xff)|END_ROW, 0);    // v\r
                break;\r
@@ -581,20 +577,20 @@ static void DrawDisplayFull()
                case 2:\r
                case 1:\r
                // both window and plane A visible, window is vertical XOR horizontal\r
-               DrawLayerFull(0, HighCacheA, planestart, planeend);\r
+               DrawLayerFull(0, HighCache2A, planestart, planeend);\r
                DrawWindowFull(winstart, winend, 0);\r
                break;\r
 \r
                default:\r
                // fullscreen plane A\r
-               DrawLayerFull(0, HighCacheA, START_ROW, (maxcolc<<16)|END_ROW);\r
+               DrawLayerFull(0, HighCache2A, START_ROW, (maxcolc<<16)|END_ROW);\r
                break;\r
        }\r
        DrawAllSpritesFull(0, maxw);\r
 \r
 #ifdef USE_CACHE\r
-       if(HighCacheB[1]) DrawTilesFromCacheF(HighCacheB);\r
-       if(HighCacheA[1]) DrawTilesFromCacheF(HighCacheA);\r
+       if(HighCache2B[1]) DrawTilesFromCacheF(HighCache2B);\r
+       if(HighCache2A[1]) DrawTilesFromCacheF(HighCache2A);\r
        switch(hvwin) {\r
                case 4:\r
                // fullscreen window\r
@@ -621,7 +617,7 @@ static void DrawDisplayFull()
 }\r
 \r
 \r
-void PicoFrameFull()\r
+PICO_INTERNAL void PicoFrameFull()\r
 {\r
        // prepare cram?\r
        if(PicoPrepareCram) PicoPrepareCram();\r