diff --git a/src/loadsave.c b/src/loadsave.c index 1eb8d96d..0bb93712 100644 --- a/src/loadsave.c +++ b/src/loadsave.c @@ -89,7 +89,8 @@ void Load_Recoil_Image(T_IO_Context *); 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;a64;pi;rp;aas;art;dd;iph;hpc;koa;koala;fli;bml;cdu;prg;tga;pnm;xpm;xcf;jpg;jpeg;tif;tiff;ico;ic2;cur;cm5;pph;info;flc"}, + "c64;p64;a64;pi;rp;aas;art;dd;iph;ipt;hpc;ocp;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"}, @@ -111,7 +112,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;a64;pi;rp;aas;art;dd;iph;hpc;koa;koala;fli;bml;cdu;prg"}, + {FORMAT_C64, " c64", Test_C64, Load_C64, Save_C64, 0, 1, 0, "c64", "c64;p64;a64;pi;rp;aas;art;dd;iph;ipt;hpc;ocp;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 bc15d595..c27eb2da 100644 --- a/src/miscfileformats.c +++ b/src/miscfileformats.c @@ -2261,7 +2261,10 @@ void Test_C64(T_IO_Context * context, FILE * file) case 9218: // $5C00 => Doodle case 10003: // multicolor + loadaddr + // $4000 => InterPaint multicolor // $6000 => Koala Painter + case 10018: + // $2000 => Advanced Art Studio case 10050: // $1800 => Picasso64 File_error = 0; @@ -2539,6 +2542,7 @@ void Load_C64(T_IO_Context * context) case 9218: // Doodle case 10001: // multicolor case 10003: // multicolor + loadaddr + case 10018: // Advanced Art Studio + loadaddr case 10050: // Picasso64 + loadaddr case 10242: // Artist64 or blazing paddle + Loadaddr case 10277: // multicolor CDU-Paint + loadaddr @@ -2645,6 +2649,17 @@ void Load_C64(T_IO_Context * context) background=file_buffer+10002; // only 1 break; + case 10018: // Advanced Art Studio (.ocp) + loadaddr + hasLoadAddr=1; + loadFormat=F_multi; + context->Ratio = PIXEL_WIDE; + bitmap=file_buffer+2; // length: 8000 + screen_ram=file_buffer+8000+2; // length: 1000 + color_ram=file_buffer+9016+2; // length: 1000 + // filebuffer+9000+2 is border + background=file_buffer+9001+2; // only 1 + break; + case 10050: // Picasso64 multicolor + loadaddr hasLoadAddr=1; loadFormat=F_multi;