# HG changeset patch # User Matti Hamalainen # Date 1424892386 -7200 # Node ID 5e820addd035e024cce8b1acef928e9348783469 # Parent ba812817a2811720a377c7767ca15a11e8a8358e Fix the multicolor bitmap widths. diff -r ba812817a281 -r 5e820addd035 tools/lib64gfx.c --- a/tools/lib64gfx.c Wed Feb 25 21:25:59 2015 +0200 +++ b/tools/lib64gfx.c Wed Feb 25 21:26:26 2015 +0200 @@ -332,8 +332,8 @@ { { D64_FMT_MC, "d2p", "DrazPaint 2.0 (packed)", 0x5800, 0, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, fmtProbeDrazPaint20Packed, fmtDecodeDrazPaintPacked, NULL, NULL, NULL, 4, @@ -364,8 +364,8 @@ { D64_FMT_MC, "drp", "DrazPaint (unpacked)", 0x5800, 10051, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, NULL, NULL, NULL, NULL, NULL, 4, @@ -414,8 +414,8 @@ { D64_FMT_MC, "kla", "Koala Paint (unpacked)", 0x6000, 10003, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, NULL, NULL, NULL, NULL, NULL, 4, @@ -429,8 +429,8 @@ { D64_FMT_MC, "ocp", "Advanced Art Studio (unpacked)", 0x2000, 10018, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, NULL, NULL, NULL, NULL, NULL, 4, @@ -444,8 +444,8 @@ { D64_FMT_MC, "ami", "Amica Paint (packed)", 0x4000, 0, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, fmtProbeAmicaPaintPacked, fmtDecodeAmicaPaintPacked, NULL, NULL, NULL, 4, @@ -459,8 +459,8 @@ { D64_FMT_MC, "rpm", "Run Paint (unpacked)", 0x6000, 10006, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, NULL, NULL, NULL, NULL, NULL, 4, @@ -474,8 +474,8 @@ { D64_FMT_HIRES, "art", "Art Studio (unpacked)", 0x2000, 9009, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH , C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, NULL, NULL, NULL, NULL, NULL, 2, @@ -513,8 +513,8 @@ { D64_FMT_MC | D64_FMT_FLI, "bml", "Blackmail FLI (unpacked)", 0x3b00, 17474, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, NULL, NULL, NULL, NULL, NULL, 11, @@ -538,8 +538,8 @@ { D64_FMT_MC | D64_FMT_FLI, "fli", "FLI Designer (unpacked)", 0x3c00, 17409, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, NULL, NULL, NULL, NULL, NULL, 11, @@ -560,8 +560,8 @@ { D64_FMT_MC, "xx1", "Unknown $2000 format (unpacked)", 0x2000, 10242, - C64_SCR_WIDTH , C64_SCR_HEIGHT, - C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, + C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, + C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, NULL, NULL, NULL, NULL, NULL, 4,