Mercurial > hg > dmlib

comparison tools/lib64fmts.c @ 1877:f8b7baf3ff89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some fixes to HCB support, now the background colors are supported correctly.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 25 Jun 2018 00:14:26 +0300
parents a35f6e19f57a
children 91cc631f959a
comparison
equal deleted inserted replaced
1876:a35f6e19f57a 1877:f8b7baf3ff89
872 { 872 {
873 const int vbank = (rasterY / 4) & 1; 873 const int vbank = (rasterY / 4) & 1;
874 (void) bitmap; 874 (void) bitmap;
875 (void) rasterX; 875 (void) rasterX;
876 876
877 return dmC64GetGenericMCPixel(img, bmoffs, scroffs, shift, vbank, 0, vbank, img->bgcolor); 877 return dmC64GetGenericMCPixel(
878 img, bmoffs, scroffs,
879 shift, vbank, 0, vbank,
880 img->extraData[0].data[rasterY / 4]);
878 } 881 }
879 882
880 883
881 static Uint8 fmtGetPixelCrestHIFLIorCDHM( 884 static Uint8 fmtGetPixelCrestHIFLIorCDHM(
882 const DMC64Image *img, const int bmoffs, const int scroffs, 885 const DMC64Image *img, const int bmoffs, const int scroffs,
1706 }, 1709 },
1707 NULL 1710 NULL
1708 }, 1711 },
1709 1712
1710 { 1713 {
1711 "hcb", "Half Char Bitmap (unpacked)", 0x5000, 12148, DM_FMT_RD, 1714 "hcb", "Half Char Bitmap (unpacked)", 0x5000, 12148, DM_FMT_RDWR,
1712 NULL, 1715 NULL,
1713 NULL, NULL, 1716 NULL, NULL,
1714 { 1717 {
1715 D64_FMT_MC | D64_FMT_FLI, 1718 D64_FMT_MC | D64_FMT_FLI,
1716 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1719 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
1721 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1724 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1722 { DO_COPY , DS_COLOR_RAM , 0x0400, 1, 0, 0, NULL, NULL }, 1725 { DO_COPY , DS_COLOR_RAM , 0x0400, 1, 0, 0, NULL, NULL },
1723 { DO_COPY , DS_SCREEN_RAM , 0x0800, 0, 0, 0, NULL, NULL }, 1726 { DO_COPY , DS_SCREEN_RAM , 0x0800, 0, 0, 0, NULL, NULL },
1724 { DO_COPY , DS_SCREEN_RAM , 0x0c00, 1, 0, 0, NULL, NULL }, 1727 { DO_COPY , DS_SCREEN_RAM , 0x0c00, 1, 0, 0, NULL, NULL },
1725 { DO_COPY , DS_BITMAP_RAM , 0x1000, 0, 0, 0, NULL, NULL }, 1728 { DO_COPY , DS_BITMAP_RAM , 0x1000, 0, 0, 0, NULL, NULL },
1729 { DO_COPY , DS_EXTRA_DATA , 0x2f40, 0, C64_SCR_HEIGHT / 4, 0, NULL, NULL },
1726 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL }, 1730 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
1727 } 1731 }
1728 }, 1732 },
1729 NULL 1733 NULL
1730 }, 1734 },