From c00f918a8ef6692637fc296c74c440aea625da48 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 28 May 2016 17:31:26 +0000 Subject: [PATCH] Propagate bm_mode::linear into bald_guy_load --- common/include/pcx.h | 2 +- similar/2d/pcx.cpp | 4 ++-- similar/main/titles.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/include/pcx.h b/common/include/pcx.h index 937ee3b01..3ca1995d3 100644 --- a/common/include/pcx.h +++ b/common/include/pcx.h @@ -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 diff --git a/similar/2d/pcx.cpp b/similar/2d/pcx.cpp index 52ec36e2d..e85bd1dfe 100644 --- a/similar/2d/pcx.cpp +++ b/similar/2d/pcx.cpp @@ -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++) { diff --git a/similar/main/titles.cpp b/similar/main/titles.cpp index 4e16a032b..81c9a107e 100644 --- a/similar/main/titles.cpp +++ b/similar/main/titles.cpp @@ -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; }