m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load_C64() add support for FLI-designer v1.1 files

Browse Source
This commit is contained in:
Thomas Bernard 2018-11-08 17:05:10 +01:00
parent 2008675d29
commit f7cc6b646e
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/miscfileformats.c
View File

@ -2393,10 +2393,11 @@ void Load_C64_fli(T_IO_Context *context, byte *bitmap, byte *screen_ram, byte *c
// Fill layer 0 with background colors // Fill layer 0 with background colors
for(y=0; y<200; y++) for(y=0; y<200; y++)
{ {
byte bg_color = 0;
if (background != NULL)
bg_color = background[y];
for(x=0; x<160; x++) for(x=0; x<160; x++)
{ Set_pixel(context, x,y, bg_color);
Set_pixel(context, x,y,background[y]);
}
} }
// Fill layer 1 with color ram (1 color per 4x8 block) // Fill layer 1 with color ram (1 color per 4x8 block)
@ -2427,7 +2428,9 @@ void Load_C64_fli(T_IO_Context *context, byte *bitmap, byte *screen_ram, byte *c
{ {
int pixel=bitmap[cy*320+cx*8+y]; int pixel=bitmap[cy*320+cx*8+y];
c[0]=background[cy*8+y]&15; c[0] = 0;
if(background != NULL)
c[0] = background[cy*8+y]&15;
c[1]=screen_ram[y*1024+cy*40+cx]>>4; c[1]=screen_ram[y*1024+cy*40+cx]>>4;
c[2]=screen_ram[y*1024+cy*40+cx]&15; c[2]=screen_ram[y*1024+cy*40+cx]&15;
for(x=0; x<4; x++) for(x=0; x<4; x++)
@ -2512,6 +2515,7 @@ void Load_C64(T_IO_Context * context)
case 10001: // multicolor case 10001: // multicolor
case 10003: // multicolor + loadaddr case 10003: // multicolor + loadaddr
case 10277: // multicolor CDU-Paint + loadaddr case 10277: // multicolor CDU-Paint + loadaddr
case 17409: // FLI-designer v1.1
case 17472: // FLI (BlackMail) case 17472: // FLI (BlackMail)
case 17474: // FLI (BlackMail) + loadaddr case 17474: // FLI (BlackMail) + loadaddr
break; break;
@ -2621,6 +2625,16 @@ void Load_C64(T_IO_Context * context)
bitmap=file_buffer+9474; // length: 8000 bitmap=file_buffer+9474; // length: 8000
break; break;
case 17409: // FLI-Designer v1.1 (+loadaddr)
hasLoadAddr=1;
loadFormat=F_fli;
context->Ratio = PIXEL_WIDE;
background=NULL;
color_ram=file_buffer+2; // length: 1000 (+ padding 24)
screen_ram=file_buffer+1024+2; // length: 8192
bitmap=file_buffer+8192+1024+2; // length: 8000
break;
default: default:
File_error = 1; File_error = 1;
free(file_buffer); free(file_buffer);