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

cleanup in Load_C64()

Browse Source
This commit is contained in:
Thomas Bernard 2018-11-06 23:52:16 +01:00
parent f207567d38
commit 8b38c36090
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/miscfileformats.c
View File

@ -2568,17 +2568,16 @@ void Load_C64(T_IO_Context * context)
width=160; width=160;
// Write detailed format in comment // Write detailed format in comment
strcpy(context->Comment, c64_format_names[loadFormat]);
if (hasLoadAddr) if (hasLoadAddr)
{ {
// get load address // get load address
word load_addr; word load_addr;
load_addr = file_buffer[0] | (file_buffer[1] << 8); load_addr = file_buffer[0] | (file_buffer[1] << 8);
sprintf(context->Comment+strlen(context->Comment),", load at $%4.4X",load_addr); snprintf(context->Comment,COMMENT_SIZE+1,"%s, load at $%4.4X",c64_format_names[loadFormat],load_addr);
} }
else else
{ {
sprintf(context->Comment+strlen(context->Comment),", no addr"); snprintf(context->Comment,COMMENT_SIZE+1,"%s, no addr",c64_format_names[loadFormat]);
} }
Pre_load(context, width, height, file_size, FORMAT_C64, context->Ratio,4); // Do this as soon as you can Pre_load(context, width, height, file_size, FORMAT_C64, context->Ratio,4); // Do this as soon as you can
@ -2590,16 +2589,13 @@ void Load_C64(T_IO_Context * context)
context->Palette[16].G=20; context->Palette[16].G=20;
context->Palette[16].B=20; context->Palette[16].B=20;
context->Width = width ;
context->Height = height;
context->Transparent_color=16; context->Transparent_color=16;
if(loadFormat==F_fli) if(loadFormat==F_fli)
{ {
Load_C64_fli(context,bitmap,screen_ram,color_ram,background); Load_C64_fli(context,bitmap,screen_ram,color_ram,background);
} }
else else if(loadFormat==F_multi)
if(loadFormat==F_multi)
{ {
Load_C64_multi(context,bitmap,screen_ram,color_ram,*background); Load_C64_multi(context,bitmap,screen_ram,color_ram,*background);
} }