Mercurial > hg > dmlib

diff 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
line wrap: on
line diff
--- a/tools/lib64fmts.c	Sun Jun 24 23:37:01 2018 +0300
+++ b/tools/lib64fmts.c	Mon Jun 25 00:14:26 2018 +0300
@@ -874,7 +874,10 @@
     (void) bitmap;
     (void) rasterX;
 
-    return dmC64GetGenericMCPixel(img, bmoffs, scroffs, shift, vbank, 0, vbank, img->bgcolor);
+    return dmC64GetGenericMCPixel(
+        img, bmoffs, scroffs,
+        shift, vbank, 0, vbank,
+        img->extraData[0].data[rasterY / 4]);
 }
 
 
@@ -1708,7 +1711,7 @@
     },
 
     {
-        "hcb", "Half Char Bitmap (unpacked)", 0x5000, 12148, DM_FMT_RD,
+        "hcb", "Half Char Bitmap (unpacked)", 0x5000, 12148, DM_FMT_RDWR,
         NULL,
         NULL, NULL,
         {
@@ -1723,6 +1726,7 @@
                 { DO_COPY       , DS_SCREEN_RAM  , 0x0800, 0,  0,   0, NULL, NULL },
                 { DO_COPY       , DS_SCREEN_RAM  , 0x0c00, 1,  0,   0, NULL, NULL },
                 { DO_COPY       , DS_BITMAP_RAM  , 0x1000, 0,  0,   0, NULL, NULL },
+                { DO_COPY       , DS_EXTRA_DATA  , 0x2f40, 0,  C64_SCR_HEIGHT / 4,   0, NULL, NULL },
                 { DO_LAST       , 0              , 0     , 0,  0,   0, NULL, NULL },
             }
         },