Mercurial > hg > dmlib
changeset 1390:e3794fb2df83
FunPaint2 decoding fixes.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sun, 24 Sep 2017 22:02:54 +0300 |
| parents | 979f550ead77 |
| children | f3c5f80511ae |
| files | tools/lib64gfx.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/lib64gfx.c Sun Sep 24 22:00:51 2017 +0300 +++ b/tools/lib64gfx.c Sun Sep 24 22:02:54 2017 +0300 @@ -498,7 +498,7 @@ const DMC64Image *img, const int bmoffs, const int scroffs, const int vshift, const int vbitmap, const int raster) { - const int vbank = (raster & 7);// + (vbitmap * 8); + const int vbank = (raster & 7) + (vbitmap * 8); int vr, vb; if (raster < 100) { @@ -858,7 +858,7 @@ { DT_BITMAP, 0x2000, 0, 0, NULL, NULL }, { DT_EXTRA_DATA, 0x3f40, 0, 100, NULL, NULL }, { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL }, - DEF_SCREEN_RAMS_8(0x4000, 8) + DEF_SCREEN_RAMS_8(0x43e8, 8) { DT_BITMAP, 0x63e8, 1, 0, NULL, NULL }, { DT_EXTRA_DATA, 0x8328, 1, 100, NULL, NULL }, { DT_LAST, 0, 0, 0, NULL, NULL }, @@ -866,7 +866,7 @@ }, { - D64_FMT_MC | D64_FMT_FLI | D64_FMT_ILACE, "fp2", "FunPaint II (packed)", 0x3ff0, 0, + D64_FMT_MC | D64_FMT_FLI | D64_FMT_ILACE, "fpp", "FunPaint II (packed)", 0x3ff0, 0, C64_SCR_WIDTH, C64_SCR_HEIGHT, C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, fmtProbeFunPaint2Packed, fmtDecodeFunPaint2Packed, @@ -876,7 +876,7 @@ { DT_BITMAP, 0x2000, 0, 0, NULL, NULL }, { DT_EXTRA_DATA, 0x3f40, 0, 100, NULL, NULL }, { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL }, - DEF_SCREEN_RAMS_8(0x4000, 8) + DEF_SCREEN_RAMS_8(0x43e8, 8) { DT_BITMAP, 0x63e8, 1, 0, NULL, NULL }, { DT_EXTRA_DATA, 0x8328, 1, 100, NULL, NULL }, { DT_LAST, 0, 0, 0, NULL, NULL },