To fix Dravis's head in endgame debriefing, don't remap the colours and read compressed .bbm bitmaps properly (both my bad)
This commit is contained in:
parent
23975df856
commit
64387a51e6
|
@ -3,6 +3,7 @@ D1X-Rebirth Changelog
|
||||||
20100919
|
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
|
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
|
20100917
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -172,7 +172,7 @@ int parse_body(PHYSFS_file *ifile,long len,iff_bitmap_header *bmheader)
|
||||||
int y;
|
int y;
|
||||||
|
|
||||||
for (y=bmheader->h;y;y--) {
|
for (y=bmheader->h;y;y--) {
|
||||||
cfread(p, bmheader->w, 1, ifile);
|
cfread(p, width, depth, ifile);
|
||||||
p += bmheader->w;
|
p += bmheader->w;
|
||||||
|
|
||||||
if (bmheader->masking == mskHasMask)
|
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
|
if (plane==depth) //masking row
|
||||||
cfseek(ifile, nn, SEEK_CUR);
|
cfseek(ifile, nn, SEEK_CUR);
|
||||||
else
|
else
|
||||||
cfread(p += nn, nn, 1, ifile);
|
{
|
||||||
|
cfread(p, nn, 1, ifile);
|
||||||
|
p += nn;
|
||||||
|
}
|
||||||
if (wid_cnt==-1) cfseek(ifile, 1, SEEK_CUR);
|
if (wid_cnt==-1) cfseek(ifile, 1, SEEK_CUR);
|
||||||
}
|
}
|
||||||
else if (n>=-127) { // next -n + 1 bytes are following byte
|
else if (n>=-127) { // next -n + 1 bytes are following byte
|
||||||
|
|
|
@ -557,7 +557,6 @@ int briefing_process_char(briefing *br)
|
||||||
gr_init_bitmap_data (&br->guy_bitmap);
|
gr_init_bitmap_data (&br->guy_bitmap);
|
||||||
iff_error = iff_read_bitmap(bitmap_name, &br->guy_bitmap, BM_LINEAR, temp_palette);
|
iff_error = iff_read_bitmap(bitmap_name, &br->guy_bitmap, BM_LINEAR, temp_palette);
|
||||||
Assert(iff_error == IFF_NO_ERROR);
|
Assert(iff_error == IFF_NO_ERROR);
|
||||||
gr_remap_bitmap_good( &br->guy_bitmap, temp_palette, -1, -1 );
|
|
||||||
|
|
||||||
br->guy_bitmap_show=1;
|
br->guy_bitmap_show=1;
|
||||||
br->prev_ch = 10;
|
br->prev_ch = 10;
|
||||||
|
|
Loading…
Reference in a new issue