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

C64 format handling was broken. Thanks petter for fixing it :)

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1376 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2010-03-08 10:25:18 +00:00
parent 3ca5322379
commit b1a5103562
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/miscfileformats.c
View File

@ -2079,8 +2079,8 @@ void Load_C64_hires(T_IO_Context *context, byte *bitmap, byte *colors)
{ {
for(cx=0; cx<40; cx++) for(cx=0; cx<40; cx++)
{ {
c[1]=colors[cy*40+cx]&15; c[0]=colors[cy*40+cx]&15;
c[0]=colors[cy*40+cx]>>4; c[1]=colors[cy*40+cx]>>4;
for(y=0; y<8; y++) for(y=0; y<8; y++)
{ {
pixel=bitmap[cy*320+cx*8+y]; pixel=bitmap[cy*320+cx*8+y];
@ -2356,6 +2356,7 @@ int Save_C64_hires(T_IO_Context *context, char *filename, byte saveWhat, byte lo
printf("\nerror at %dx%d (%d colors)\n",cx*8,cy*8,numcolors); printf("\nerror at %dx%d (%d colors)\n",cx*8,cy*8,numcolors);
return 1; return 1;
} }
c1 = 0; c2 = 0;
for(i=0;i<16;i++) for(i=0;i<16;i++)
{ {
if(cusage[i]) if(cusage[i])
@ -2364,8 +2365,8 @@ int Save_C64_hires(T_IO_Context *context, char *filename, byte saveWhat, byte lo
break; break;
} }
} }
c1=c2; c1=c2+1;
for(i=c2+1;i<16;i++) for(i=c2;i<16;i++)
{ {
if(cusage[i]) if(cusage[i])
{ {
@ -2389,7 +2390,7 @@ int Save_C64_hires(T_IO_Context *context, char *filename, byte saveWhat, byte lo
return 1; return 1;
} }
bits=bits<<1; bits=bits<<1;
if (pixel==c1) bits|=1; if (pixel==c2) bits|=1;
} }
bitmap[pos++]=bits; bitmap[pos++]=bits;
//Write_byte(file,bits&255); //Write_byte(file,bits&255);