From 7cd9efc7f35c1a021d6e2b6fdd32cdca6f09e57d Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Thu, 8 Nov 2018 17:38:22 +0100
Subject: [PATCH] Load_C64() : Add Artist64 format

---
 src/loadsave.c        |  4 ++--
 src/miscfileformats.c | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/loadsave.c b/src/loadsave.c
index fdd993d8..db255634 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -87,7 +87,7 @@ void Load_Recoil_Image(T_IO_Context *);
 
 // ENUM     Name  TestFunc LoadFunc SaveFunc PalOnly Comment Layers Ext Exts  
 const T_Format File_formats[] = {
-  {FORMAT_ALL_IMAGES, "(all)", NULL, NULL, NULL, 0, 0, 0, "", "gif;png;bmp;2bp;pcx;pkm;iff;lbm;ilbm;sham;ham;ham6;ham8;acbm;pic;anim;img;sci;scq;scf;scn;sco;pi1;pc1;cel;neo;c64;p64;koa;koala;fli;bml;cdu;prg;tga;pnm;xpm;xcf;jpg;jpeg;tif;tiff;ico;ic2;cur;cm5;pph;info;flc"},
+  {FORMAT_ALL_IMAGES, "(all)", NULL, NULL, NULL, 0, 0, 0, "", "gif;png;bmp;2bp;pcx;pkm;iff;lbm;ilbm;sham;ham;ham6;ham8;acbm;pic;anim;img;sci;scq;scf;scn;sco;pi1;pc1;cel;neo;c64;p64;a64;koa;koala;fli;bml;cdu;prg;tga;pnm;xpm;xcf;jpg;jpeg;tif;tiff;ico;ic2;cur;cm5;pph;info;flc"},
   {FORMAT_ALL_PALETTES, "(pal)", NULL, NULL, NULL, 1, 0, 0, "", "kcf;pal;gpl"},
   {FORMAT_ALL_FILES, "(*.*)", NULL, NULL, NULL, 0, 0, 0, "", "*"},
   {FORMAT_GIF, " gif", Test_GIF, Load_GIF, Save_GIF, 0, 1, 1, "gif", "gif"},
@@ -109,7 +109,7 @@ const T_Format File_formats[] = {
   {FORMAT_KCF, " kcf", Test_KCF, Load_KCF, Save_KCF, 1, 0, 0, "kcf", "kcf"},
   {FORMAT_PAL, " pal", Test_PAL, Load_PAL, Save_PAL, 1, 0, 0, "pal", "pal"},
   {FORMAT_GPL, " gpl", Test_GPL, Load_GPL, Save_GPL, 1, 0, 0, "gpl", "gpl"},
-  {FORMAT_C64, " c64", Test_C64, Load_C64, Save_C64, 0, 1, 0, "c64", "c64;p64;koa;koala;fli;bml;cdu;prg"},
+  {FORMAT_C64, " c64", Test_C64, Load_C64, Save_C64, 0, 1, 0, "c64", "c64;p64;a64;koa;koala;fli;bml;cdu;prg"},
   {FORMAT_SCR, " cpc", NULL,     NULL,     Save_SCR, 0, 0, 0, "cpc", "cpc;scr"},
   {FORMAT_CM5, " cm5", Test_CM5, Load_CM5, Save_CM5, 0, 0, 1, "cm5", "cm5"},
   {FORMAT_PPH, " pph", Test_PPH, Load_PPH, Save_PPH, 0, 0, 1, "pph", "pph"},
diff --git a/src/miscfileformats.c b/src/miscfileformats.c
index 0ffbf7e4..a3217fac 100644
--- a/src/miscfileformats.c
+++ b/src/miscfileformats.c
@@ -2258,6 +2258,9 @@ void Test_C64(T_IO_Context * context, FILE * file)
       // $6000 => Koala Painter
     case 10050:
       // $1800 => Picasso64
+    case 10242:
+      // $4000 => Artist 64
+      // ? $A000 => Blazing paddles ?
     case 17409:
       // $3c00 => FLI-designer v1.1
       // ? $3ff0 => FLI designer 2 ?
@@ -2517,6 +2520,7 @@ void Load_C64(T_IO_Context * context)
             case 10001: // multicolor
             case 10003: // multicolor + loadaddr
             case 10050: // Picasso64 + loadaddr
+            case 10242: // Artist64 or blazing paddle + Loadaddr
             case 10277: // multicolor CDU-Paint + loadaddr
             case 17409: // FLI-designer v1.1
             case 17472: // FLI (BlackMail)
@@ -2607,6 +2611,16 @@ void Load_C64(T_IO_Context * context)
                 background=file_buffer+1024*2+2-1; // only 1
                 break;
 
+            case 10242: // Artist 64 multicolor + loadaddr
+                hasLoadAddr=1;
+                loadFormat=F_multi;
+                context->Ratio = PIXEL_WIDE;
+                bitmap=file_buffer+2; // length: 8000 (+padding 192)
+                screen_ram=file_buffer+8192+2; // length: 1000 + (padding 24)
+                color_ram=file_buffer+1024+8192+2; // length: 1000 + (padding 24)
+                background=file_buffer+1024*2+8192+2-1; // only 1
+                break;
+
             case 10277: // multicolor CDU-Paint + loadaddr
                 hasLoadAddr=1;
                 loadFormat=F_multi;