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

Propagate bm_mode::linear into bald_guy_load

Browse source
This commit is contained in:
Kp 2016-05-28 17:31:26 +00:00
parent 3fb16c1d7a
commit c00f918a8e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/include/pcx.h
View file

@ -45,7 +45,7 @@ struct palette_array_t;
#if defined(DXX_BUILD_DESCENT_I)
namespace dsx {
// Load bitmap for little-known 'baldguy' cheat.
extern int bald_guy_load( const char * filename, grs_bitmap * bmp,int bitmap_type ,palette_array_t &palette );
extern int bald_guy_load(const char *filename, grs_bitmap *bmp, palette_array_t &palette);
}
#endif

4
similar/2d/pcx.cpp
View file

@ -98,7 +98,7 @@ static int PCXHeader_read_n(PCXHeader *ph, int n, PHYSFS_File *fp)
#if defined(DXX_BUILD_DESCENT_I)
namespace dsx {
int bald_guy_load(const char * filename, grs_bitmap * bmp,int bitmap_type ,palette_array_t &palette )
int bald_guy_load(const char *const filename, grs_bitmap *const bmp, palette_array_t &palette)
{
PCXHeader header;
int i, count, fsize;
@ -153,7 +153,7 @@ int bald_guy_load(const char * filename, grs_bitmap * bmp,int bitmap_type ,palet
}
bmp->bm_w = bmp->bm_rowsize = xsize;
bmp->bm_h = ysize;
bmp->set_type(bitmap_type);
bmp->set_type(bm_mode::linear);
}
for (row=0; row< ysize ; row++) {

2
similar/main/titles.cpp
View file

@ -1229,7 +1229,7 @@ static int load_briefing_screen(briefing *br, const char *fname)
strncpy (br->background_name,fname2, sizeof(br->background_name));
if ((!d_stricmp(fname2, "brief02.pcx") || !d_stricmp(fname2, "brief02h.pcx")) && cheats.baldguy)
if ( bald_guy_load("btexture.xxx", &br->background, bm_mode::linear, gr_palette) == 0)
if (bald_guy_load("btexture.xxx", &br->background, gr_palette) == 0)
{
return 0;
}