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

To fix Dravis's head in endgame debriefing, don't remap the colours and read compressed .bbm bitmaps properly (both my bad)

Browse source
This commit is contained in:
kreatordxx 2010-09-19 13:33:22 +00:00
parent 23975df856
commit 64387a51e6
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
20100919
--------
main/state.c: Pass -1 instead of 255 as the colour to ogl_ubitmapm_cs when drawing savegame previews, to make sure a black rectangle isn't drawn instead
iff/iff.c, main/titles.c: To fix Dravis's head in endgame debriefing, don't remap the colours and read compressed .bbm bitmaps properly (both my bad)
20100917
--------

7
iff/iff.c
View file

@ -172,7 +172,7 @@ int parse_body(PHYSFS_file *ifile,long len,iff_bitmap_header *bmheader)
int y;
for (y=bmheader->h;y;y--) {
cfread(p, bmheader->w, 1, ifile);
cfread(p, width, depth, ifile);
p += bmheader->w;
if (bmheader->masking == mskHasMask)
@ -207,7 +207,10 @@ int parse_body(PHYSFS_file *ifile,long len,iff_bitmap_header *bmheader)
if (plane==depth) //masking row
cfseek(ifile, nn, SEEK_CUR);
else
cfread(p += nn, nn, 1, ifile);
{
cfread(p, nn, 1, ifile);
p += nn;
}
if (wid_cnt==-1) cfseek(ifile, 1, SEEK_CUR);
}
else if (n>=-127) { // next -n + 1 bytes are following byte

1
main/titles.c
View file

@ -557,7 +557,6 @@ int briefing_process_char(briefing *br)
gr_init_bitmap_data (&br->guy_bitmap);
iff_error = iff_read_bitmap(bitmap_name, &br->guy_bitmap, BM_LINEAR, temp_palette);
Assert(iff_error == IFF_NO_ERROR);
gr_remap_bitmap_good( &br->guy_bitmap, temp_palette, -1, -1 );
br->guy_bitmap_show=1;
br->prev_ch = 10;