TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

code cleanup

Browse source
This commit is contained in:
zicodxx 2007-02-07 12:22:22 +00:00
parent ac5cf1fe60
commit 0adb299c15
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dxx-changelog.txt
View file

@ -3,7 +3,7 @@ D1X-Rebirth Changelog
20070207
--------
main/game.c: expanded help menu and fixed d1x help
iff/iff.c: amd64 fixes
iff/iff.c: amd64 fixes, code cleanup
20070206
--------

17
iff/iff.c
View file

@ -772,7 +772,7 @@ int convert_ilbm_to_pbm(iff_bitmap_header *bmheader)
for (y=0;y<bmheader->h;y++) {
rowptr = &bmheader->raw_data[y * bytes_per_row * bmheader->nplanes];
rowptr = (signed char *) &bmheader->raw_data[y * bytes_per_row * bmheader->nplanes];
for (x=0,checkmask=0x80;x<bmheader->w;x++) {
@ -794,7 +794,7 @@ int convert_ilbm_to_pbm(iff_bitmap_header *bmheader)
}
free(bmheader->raw_data);
bmheader->raw_data = new_data;
bmheader->raw_data = (unsigned char *) new_data;
bmheader->type = TYPE_PBM;
@ -945,13 +945,10 @@ int iff_read_bitmap(char *ifilename,grs_bitmap *bm,int bitmap_type,ubyte *palett
FFILE ifile;
ret = open_fake_file(ifilename,&ifile); //read in entire file
if (ret != IFF_NO_ERROR) goto done;
gr_init_bitmap_data (bm);
ret = iff_parse_bitmap(&ifile,bm,bitmap_type,palette,NULL);
done:
if (ret == IFF_NO_ERROR) {
bm->bm_data = NULL;
ret = iff_parse_bitmap(&ifile,bm,bitmap_type,(signed char *) palette,NULL);
}
if (ifile.data) free(ifile.data);
@ -1335,7 +1332,7 @@ int iff_read_animbrush(char *ifilename,grs_bitmap **bm_list,int max_bitmaps,int
bm_list[*n_bitmaps]=(grs_bitmap *)malloc(1*sizeof(grs_bitmap));
gr_init_bitmap_data ((grs_bitmap *) &bm_list[*n_bitmaps]);
ret = iff_parse_bitmap(&ifile,bm_list[*n_bitmaps],form_type,*n_bitmaps>0?NULL:palette,prev_bm);
ret = iff_parse_bitmap(&ifile,bm_list[*n_bitmaps],form_type,*n_bitmaps>0?NULL:(signed char *)palette,prev_bm);
if (ret != IFF_NO_ERROR)
goto done;