--- np2/vram/scrnbmp.c 2004/03/27 10:52:55 1.4 +++ np2/vram/scrnbmp.c 2004/06/21 14:29:23 1.6 @@ -56,7 +56,7 @@ static void screenmix3(PALNUM *dest, con for (y=0; y<(SURFACE_HEIGHT/2); y++) { // dest == src1, dest == src2 の時があるので… for (x=0; x> 4; + c = (src1[x + SURFACE_WIDTH]) >> 4; if (!c) { c = src2[x] + NP2PAL_SKIP; } @@ -186,17 +186,17 @@ SCRNBMP scrnbmp(void) { s += SURFACE_WIDTH; } - if (pals < 2) { + if (pals <= 2) { type = SCRNBMP_1BIT; bd.bpp = 1; palsize = 4 << 1; } - else if (pals < 16) { + else if (pals <= 16) { type = SCRNBMP_4BIT; bd.bpp = 4; palsize = 4 << 4; } - else if (pals < 256) { + else if (pals <= 256) { type = SCRNBMP_8BIT; bd.bpp = 8; palsize = 4 << 8; @@ -236,7 +236,7 @@ SCRNBMP scrnbmp(void) { switch(type) { case SCRNBMP_1BIT: for (x=0; x> 3] |= 0x80 >> (x & 7); } }